(normal-mode): If font lock is on, turn it off and on.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c2a0e44fb8312c293aea3ce22e7b731b87bdfcd..d2f4f011ff744471ffbf7a8f44bbd21c7d582802 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2005-08-20  Richard M. Stallman  <rms@gnu.org>
+
+       * files.el (normal-mode): If font lock is on, turn it off and on.
+
+       * subr.el (replace-regexp-in-string): Doc fix.
+
+       * startup.el (command-line-1): Don't suppress startup screen
+       due to existing processes.
+
+       * progmodes/grep.el (grep): Bind compilation-disable-input to t.
+
+       * progmodes/compile.el (compilation-disable-input): Default to nil.
+
 2005-08-20  Kevin Rodgers  <ihs_4664@yahoo.com>  (tiny change)
 
        * progmodes/compile.el (compilation-disable-input): New defcustom.

diff --git a/lisp/files.el b/lisp/files.el
index c2cce8b57c93bb2066653a1deb4a3688ce10f02f..1613f3add9509a2f7f7aac2713425830f8eb9b20 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1733,6 +1733,12 @@ in that case, this function acts as if `enable-local-variables' were t."
       (set-auto-mode))
     (report-errors "File local-variables error: %s"
       (hack-local-variables)))
+  ;; Turn font lock off and on, to make sure it takes account of
+  ;; whatever file local variables are relevant to it.
+  (when (and font-lock-mode (eq (car font-lock-keywords) t))
+    (setq font-lock-keywords (cadr font-lock-keywords))
+    (font-lock-mode 1))
+
   (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
       (ucs-set-table-for-input)))