font-lock-set-defaults-1.
(turn-on-font-lock-if-enabled): Always turn on font-lock unless it
is specifically excluded by the user.
+
+ * font-lock.el (font-lock-set-defaults-1): Set variable alist here.
+
+ * help-mode.el (help-mode): Don't set `font-lock-defaults'.
+
+ * ibuffer.el (ibuffer-mode): Don't set `font-lock-defaults'.
+
+ * info.el (Info-mode): Don't set `font-lock-defaults'.
+
+ * replace.el (occur-mode): Don't set `font-lock-defaults'.
+
+ * help-mode.el (help-highlight-p, help-highlight-face): Variable
+ was unused; deleted.
+ (help-make-xrefs): Doc fix.
2002-06-11 Richard M. Stallman <rms@gnu.org>
`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
(push (list 'face 'font-lock-face) char-property-alias-alist)))
;; Only do hard work if the mode has specified stuff in
;; `font-lock-defaults'.
- (when (and font-lock-defaults
- (not font-lock-core-only))
+ (when font-lock-defaults
(add-hook 'after-change-functions 'font-lock-after-change-function t t)
(font-lock-turn-on-thing-lock)
;; Fontify the buffer if we have to.
(setcdr elt (remq 'font-lock-face (cdr elt)))
(when (null (cdr elt))
(setq char-property-alias-alist (delq elt char-property-alias-alist)))))
- (when (and font-lock-defaults
- (not font-lock-core-only))
+ (when font-lock-defaults
(remove-hook 'after-change-functions 'font-lock-after-change-function t)
(font-lock-unfontify-buffer)
(font-lock-turn-off-thing-lock))))
(make-local-variable 'font-lock-multiline)
(let ((defaults (or font-lock-defaults
(cdr (assq major-mode font-lock-defaults-alist)))))
- ;; Variable alist?
- (dolist (x (nthcdr 5 defaults))
- (set (make-local-variable (car x)) (cdr x)))
- (when (and defaults
- ;; Detect if this is a simple mode, which doesn't use
- ;; any syntactic fontification functions.
- (not font-lock-core-only))
+ (when defaults
(require 'font-lock)
(font-lock-set-defaults-1)))))
:group 'font-lock)
(defun turn-on-font-lock-if-enabled ()
- (when (and (or font-lock-defaults
- (assq major-mode font-lock-defaults-alist))
- (or (eq font-lock-global-modes t)
- (if (eq (car-safe font-lock-global-modes) 'not)
- (not (memq major-mode (cdr font-lock-global-modes)))
- (memq major-mode font-lock-global-modes))))
+ (unless (and (eq (car-safe font-lock-global-modes) 'not)
+ (memq major-mode (cdr font-lock-global-modes)))
(let (inhibit-quit)
(turn-on-font-lock))))