*** empty log message ***

[gnu-emacs] / lisp / fast-lock.el

diff --git a/lisp/fast-lock.el b/lisp/fast-lock.el
index b9308a8265fbf4f101a0509cfe7edc63bea23ebe..68b6683305a4931401f7a62dd7b27c6fa12b2ff3 100644 (file)
--- a/lisp/fast-lock.el
+++ b/lisp/fast-lock.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
-;; Author: Simon Marshall <simon@gnu.ai.mit.edu>
+;; Author: Simon Marshall <simon@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: faces files
 ;; Version: 3.14
 
@@ -217,10 +218,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)
@@ -231,7 +237,7 @@
 ;  "Submit via mail a bug report on fast-lock.el."
 ;  (interactive)
 ;  (let ((reporter-prompt-for-summary-p t))
-;    (reporter-submit-bug-report "simon@gnu.ai.mit.edu" "fast-lock 3.14"
+;    (reporter-submit-bug-report "simon@gnu.org" "fast-lock 3.14"
 ;     '(fast-lock-cache-directories fast-lock-minimum-size
 ;       fast-lock-save-others fast-lock-save-events fast-lock-save-faces
 ;       fast-lock-verbose)
@@ -547,7 +553,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 +580,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 +636,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))))