From efd314de5564b4fa082d22ffaa3bfdc7c9c7efaf Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 22 Sep 2014 09:52:06 -0400 Subject: [PATCH] * lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda expression for a list. --- lisp/ChangeLog | 3 +++ lisp/font-lock.el | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7dcc1eb9edb..e79080ab3d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-09-22 Stefan Monnier + * font-lock.el (font-lock-compile-keyword): Don't confuse a lambda + expression for a list. + * emacs-lisp/bytecomp.el (byte-compile-lambda): Don't add fundoc usage for functions with no arguments. 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)))) -- 2.11.4.GIT