[Emacs-diffs] Changes to emacs/lisp/files.el

[Stefan Monnier]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.788 emacs/lisp/files.el:1.789
*** emacs/lisp/files.el:1.788   Wed Aug 31 13:49:25 2005
--- emacs/lisp/files.el Mon Sep 12 15:05:21 2005
***************
*** 1738,1744 ****
        (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))
  
--- 1738,1748 ----
        (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
!              ;; Font-lock-mode (now in font-core.el) can be ON when
!              ;; font-lock.el still hasn't been loaded.
!              (boundp 'font-lock-keywords)
!              (eq (car font-lock-keywords) t))
      (setq font-lock-keywords (cadr font-lock-keywords))
      (font-lock-mode 1))