diff options
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r-- | lisp/font-lock.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 29d3bc58646..b4cf5b0387d 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -327,6 +327,9 @@ If a number, only buffers greater than this size have fontification messages." (defvar font-lock-type-face 'font-lock-type-face "Face name to use for type and class names.") +(define-obsolete-variable-alias + 'font-lock-reference-face 'font-lock-constant-face "20.3") + (defvar font-lock-constant-face 'font-lock-constant-face "Face name to use for constant and label names.") @@ -340,9 +343,6 @@ This can be an \"!\" or the \"n\" in \"ifndef\".") (defvar font-lock-preprocessor-face 'font-lock-preprocessor-face "Face name to use for preprocessor directives.") -(define-obsolete-variable-alias - 'font-lock-reference-face 'font-lock-constant-face "20.3") - ;; Fontification variables: (defvar font-lock-keywords nil @@ -631,10 +631,7 @@ Major/minor modes can set this variable if they know which option applies.") (declare (indent 0) (debug t)) `(let ((inhibit-point-motion-hooks t)) (with-silent-modifications - ,@body))) - ;; - ;; Shut up the byte compiler. - (defvar font-lock-face-attributes)) ; Obsolete but respected if set. + ,@body)))) (defvar-local font-lock-set-defaults nil) ; Whether we have set up defaults. @@ -929,9 +926,9 @@ The value of this variable is used when Font Lock mode is turned on." (defun font-lock-turn-on-thing-lock () (pcase (font-lock-value-in-major-mode font-lock-support-mode) - (`fast-lock-mode (fast-lock-mode t)) - (`lazy-lock-mode (lazy-lock-mode t)) - (`jit-lock-mode + ('fast-lock-mode (fast-lock-mode t)) + ('lazy-lock-mode (lazy-lock-mode t)) + ('jit-lock-mode ;; Prepare for jit-lock (remove-hook 'after-change-functions #'font-lock-after-change-function t) |