diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/subr.el | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 612a7ea5009..6af9ae7ba12 100644 --- 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 4029b7fa334..6296d6a9bb5 100644 --- 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'. |