Mercurial > emacs
changeset 24005:c78112715e6c
* fast-lock.el (fast-lock-save-cache-1):
(fast-lock-cache-data): When using with-temp-message, use nil rather
than current-message.
| author | Simon Marshall <simon@gnu.org> |
|---|---|
| date | Wed, 06 Jan 1999 10:22:13 +0000 |
| parents | 42a8238f0597 |
| children | 3d9e32528ca1 |
| files | lisp/fast-lock.el |
| diffstat | 1 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/fast-lock.el Wed Jan 06 10:16:28 1999 +0000 +++ b/lisp/fast-lock.el Wed Jan 06 10:22:13 1999 +0000 @@ -217,10 +217,15 @@ ;; We use this for compatibility with a future Emacs. (or (fboundp 'with-temp-message) (defmacro with-temp-message (message &rest body) - (` (let ((current-message (current-message))) + (` (let ((temp-message (, message)) current-message) (unwind-protect - (progn (message (, message)) (,@ body)) - (message current-message)))))) + (progn + (when temp-message + (setq current-message (current-message)) + (message temp-message)) + (,@ body)) + (when temp-message + (message current-message))))))) ;; ;; We use this for compatibility with a future Emacs. (or (fboundp 'defcustom) @@ -574,9 +579,8 @@ fast-lock-verbose)) (saved t)) (with-temp-message - (if verbose - (format "Saving %s font lock cache..." (buffer-name)) - (current-message)) + (when verbose + (format "Saving %s font lock cache..." (buffer-name))) (condition-case nil (save-excursion (print (list 'fast-lock-cache-data 3 @@ -631,9 +635,8 @@ (not (equal keywords font-lock-keywords))) (setq loaded nil) (with-temp-message - (if verbose - (format "Loading %s font lock cache..." (buffer-name)) - (current-message)) + (when verbose + (format "Loading %s font lock cache..." (buffer-name))) (condition-case nil (fast-lock-add-properties syntactic-properties face-properties) (error (setq loaded 'error)) (quit (setq loaded 'quit))))