[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117916: * lisp/font-lock.el (font-lock-compile-keyw
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117916: * lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda |
Date: |
Mon, 22 Sep 2014 13:52:11 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117916
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-22 09:52:06 -0400
message:
* lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda
expression for a list.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/font-lock.el fontlock.el-20091113204419-o5vbwnq5f7feedwu-603
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-22 13:47:47 +0000
+++ b/lisp/ChangeLog 2014-09-22 13:52:06 +0000
@@ -1,5 +1,8 @@
2014-09-22 Stefan Monnier <address@hidden>
+ * 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.
=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2014-05-29 03:45:29 +0000
+++ b/lisp/font-lock.el 2014-09-22 13:52:06 +0000
@@ -1759,7 +1759,7 @@
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 @@
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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117916: * lisp/font-lock.el (font-lock-compile-keyword): Don't confuse a lambda,
Stefan Monnier <=