Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-09-07 18:03:03 +02:00
commit f22c23277f

View file

@ -241,11 +241,9 @@ should be asked whether to allow evaluation."
(query (or (equal eval "query") (query (or (equal eval "query")
(and export (equal eval "query-export")) (and export (equal eval "query-export"))
(if (functionp org-confirm-babel-evaluate) (if (functionp org-confirm-babel-evaluate)
(save-excursion
(goto-char (nth 5 info))
(funcall org-confirm-babel-evaluate (funcall org-confirm-babel-evaluate
;; language, code block body ;; Language, code block body.
(nth 0 info) (nth 1 info))) (nth 0 info) (nth 1 info))
org-confirm-babel-evaluate)))) org-confirm-babel-evaluate))))
(cond (cond
(noeval nil) (noeval nil)