Mercurial > emacs
changeset 45708:148691ba23f9
(font-lock-core-only): New variable.
(font-lock-set-defaults): Use it.
| author | Colin Walters <walters@gnu.org> |
|---|---|
| date | Sun, 09 Jun 2002 00:19:23 +0000 |
| parents | 1ad70e69b4ba |
| children | 77b4e2d5f8dd |
| files | lisp/font-core.el |
| diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/font-core.el Sun Jun 09 00:18:15 2002 +0000 +++ b/lisp/font-core.el Sun Jun 09 00:19:23 2002 +0000 @@ -73,6 +73,9 @@ `font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.") (make-variable-buffer-local 'font-lock-defaults) +(defvar font-lock-core-only nil + "If non-nil, then don't load font-lock.el unless necessary.") + ;; This variable is used where font-lock.el itself supplies the ;; keywords. Really, this shouldn't need to be in font-core.el, but ;; we can't avoid it. In the future, this stuff will hopefully be @@ -264,12 +267,15 @@ (set (make-local-variable 'font-lock-set-defaults) t) (make-local-variable 'font-lock-fontified) (make-local-variable 'font-lock-multiline) - ;; Detect if this is a simple mode, which doesn't use any - ;; syntactic fontification functions. - (when (or font-lock-defaults - (assq major-mode font-lock-defaults-alist)) - (require 'font-lock) - (font-lock-set-defaults-1)))) + (let ((defaults (or font-lock-defaults + (assq major-mode font-lock-defaults-alist)))) + (when (and defaults + ;; Detect if this is a simple mode, which doesn't use + ;; any syntactic fontification functions. + (not (cdr (assq 'font-lock-core-only + (nthcdr 5 defaults))))) + (require 'font-lock) + (font-lock-set-defaults-1))))) ;;; Global Font Lock mode.