summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-09-22 09:52:06 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-09-22 09:52:06 -0400
commitefd314de5564b4fa082d22ffaa3bfdc7c9c7efaf (patch)
tree019ce45f3a671d543c23e2908291a9822d939722 /lisp/font-lock.el
parent55fa245f374a897bbdef5ca53d6681419fda8026 (diff)
downloademacs-efd314de5564b4fa082d22ffaa3bfdc7c9c7efaf.tar.gz
* lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda
expression for a list.
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index fe37c24579b..0a6a0e80d15 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -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))))