Don't allow functions that display messages in unsafep.

* emacs-lisp/unsafep.el: Don't mark functions that display
messages as safe.  Suggested by Johan Bockgård.

2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c560c33b9d..eb26c3923bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/unsafep.el: Don't mark functions that display
+        messages as safe.  Suggested by Johan Bockgård.
+
 2010-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (completion--replace): Move point where it belongs
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 851a1f7652b..a62f8de4010 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -101,15 +101,13 @@ in the parse.")
 (dolist (x '(;;Special forms
              and catch if or prog1 prog2 progn while unwind-protect
              ;;Safe subrs that have some side-effects
-             ding error message minibuffer-message random read-minibuffer
-             signal sleep-for string-match throw y-or-n-p yes-or-no-p
+             ding error random signal sleep-for string-match throw
              ;;Defsubst functions from subr.el
              caar cadr cdar cddr
              ;;Macros from subr.el
-             save-match-data unless when with-temp-message
+             save-match-data unless when
              ;;Functions from subr.el that have side effects
-             read-passwd split-string replace-regexp-in-string
-             play-sound-file))
+             split-string replace-regexp-in-string play-sound-file))
   (put x 'safe-function t))
 
 ;;;###autoload