Mercurial > emacs
diff lisp/files.el @ 65467:2e5f838e6ca7
(normal-mode): Check boundness of font-lock-keywords.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 12 Sep 2005 15:05:24 +0000 |
parents | bb72cd763704 |
children | 4d1085b02d64 94f174e5569d |
line wrap: on
line diff
--- a/lisp/files.el Mon Sep 12 13:42:49 2005 +0000 +++ b/lisp/files.el Mon Sep 12 15:05:24 2005 +0000 @@ -1738,7 +1738,11 @@ (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)) + (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))