(font-lock-fontify-buffer): Don't turn

font-lock-mode on and off; just call font-lock-set-defaults.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index ae8d5764e5d3cb1c3219bcb4336423ed0877bd26..a2b5b7d1c4e65ada62cd0d12f6e1bd52a8cab98c 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -390,7 +390,7 @@ This can take a while for large buffers."
        (font-lock-verbose (or font-lock-verbose (interactive-p))))
     (if font-lock-verbose (message "Fontifying %s..." (buffer-name)))
     ;; Turn it on to run hooks and get the right font-lock-keywords.
-    (or was-on (font-lock-mode 1))
+    (or was-on (font-lock-set-defaults))
     (font-lock-unfontify-region (point-min) (point-max))
     (if font-lock-verbose (message "Fontifying %s... (syntactically...)"
                                   (buffer-name)))
@@ -400,7 +400,6 @@ This can take a while for large buffers."
       (if font-lock-verbose (message "Fontifying %s... (regexps...)"
                                     (buffer-name)))
       (font-lock-hack-keywords (point-min) (point-max) font-lock-verbose))
-    (or was-on (font-lock-mode 0)) ; turn it off if it was off.
     (set (make-local-variable 'font-lock-fontified) t)
     (if font-lock-verbose (message "Fontifying %s... done." (buffer-name)))
     ))