Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

2010-11-25 22:32:16 +01:00 · 2010-11-25 22:32:16 +01:00 · 88bd7bbe89
parent b2f556a159 30b2d604c5
commit 88bd7bbe89
1 changed files with 3 additions and 1 deletions
--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -220,7 +220,9 @@ of potentially harmful code."
 		 (not (yes-or-no-p
 		       (format "Evaluate this%scode on your system? "
 			       (if info (format " %s " (nth 0 info)) " "))))))
-	(prog1 nil (message "evaluation aborted"))
+	(prog1 nil (message "Evaluation %s"
+			    (if (or (equal eval "never") (equal eval "no"))
+				"Disabled" "Aborted")))
      t)))

 ;;;###autoload