Finish vc-stay-local containment.

[gnu-emacs] / lisp / font-lock.el

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index fe37c24579b4b060d4b523b44c610a944c7ab583..22444277ba2ef177883f0366ccb35f5f14a9e9f1 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1047,7 +1047,7 @@ The region it returns may start or end in the middle of a line.")
    ;; Of course, this function doesn't do all of the above in all situations
    ;; (e.g. depending on whether jit-lock is in use) and it can't guess what
    ;; the caller wants.
-   (interactive-only "use font-lock-ensure or font-lock-flush instead."))
+   (interactive-only "use `font-lock-ensure' or `font-lock-flush' instead."))
   (interactive "p")
   (font-lock-set-defaults)
   (let ((font-lock-verbose (or font-lock-verbose interactively)))
@@ -1759,7 +1759,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for
       keywords
     (setq keywords
          (cons t (cons keywords
-                       (mapcar 'font-lock-compile-keyword keywords))))
+                       (mapcar #'font-lock-compile-keyword keywords))))
     (if (and (not syntactic-keywords)
             (let ((beg-function
                    (or font-lock-beginning-of-syntax-function
@@ -1783,7 +1783,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for
     keywords))
 
 (defun font-lock-compile-keyword (keyword)
-  (cond ((nlistp keyword)                      ; MATCHER
+  (cond ((or (functionp keyword) (nlistp keyword)) ; MATCHER
         (list keyword '(0 font-lock-keyword-face)))
        ((eq (car keyword) 'eval)               ; (eval . FORM)
         (font-lock-compile-keyword (eval (cdr keyword))))