mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 06:31:13 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda

Browse source 
expression for a list.
This commit is contained in:
Stefan Monnier 2014-09-22 09:52:06 -04:00
parent 55fa245f37
commit efd314de55
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2014-09-22 Stefan Monnier <monnier@iro.umontreal.ca>
* 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.

4
lisp/font-lock.el
View file

@ -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))))