(with-temp-message): At the end, always discard

the temp message, even by clearing the echo area.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 612a7ea5009a5a8f5df75b8991381881e7c36e26..6af9ae7ba1281b5be13ab5f83d8149cd73b02e74 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-16  Richard M. Stallman  <rms@gnu.org>
+
+       * subr.el (with-temp-message): At the end, always discard
+       the temp message, even by clearing the echo area.
+
+       * progmodes/sh-script.el (sh-mode): Run sh-mode-hook.
+
 2001-12-16  Stefan Monnier  <monnier@cs.yale.edu>
 
        * international/fontset.el: Build the list L at compile time.

diff --git a/lisp/subr.el b/lisp/subr.el
index 4029b7fa334898c8090b95e08237830d89956f3f..6296d6a9bb5a98641e51c7aaffea032500cac69a 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1216,8 +1216,10 @@ Use a MESSAGE of \"\" to temporarily clear the echo area."
               (setq ,current-message (current-message))
               (message "%s" ,temp-message))
             ,@body)
-        (and ,temp-message ,current-message
-             (message "%s" ,current-message))))))
+        (and ,temp-message
+             (if ,current-message
+                 (message "%s" ,current-message)
+               (message nil)))))))
 
 (defmacro with-temp-buffer (&rest body)
   "Create a temporary buffer, and evaluate BODY there like `progn'.