X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ff2da396d7ee3bd2e0281c855de82c1cd933d7d1..0b64a3da3a1673936bb61a5a9faa103640c66cf9:/lisp/fast-lock.el

diff --git a/lisp/fast-lock.el b/lisp/fast-lock.el
index b9308a8265..fca1188789 100644
--- a/lisp/fast-lock.el
+++ b/lisp/fast-lock.el
@@ -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)
@@ -547,7 +552,7 @@ See `fast-lock-cache-directory'."
       (concat buffer-file-name ".flc")
     (let* ((bufile (expand-file-name buffer-file-truename))
 	   (chars-alist
-	    (if (memq system-type '(emx windowsnt))
+	    (if (memq system-type '(emx windows-nt))
 		'((?/ . (?#)) (?# . (?# ?#)) (?: . (?\;)) (?\; . (?\; ?\;)))
 	      '((?/ . (?#)) (?# . (?# ?#)))))
 	   (mapchars
@@ -574,9 +579,8 @@ See `fast-lock-cache-directory'."
 		   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 @@ See `fast-lock-cache-directory'."
 	    (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))))