summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/font-lock.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03fbe15a616..c4161e63477 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-08 Glenn Morris <rgm@gnu.org>
+
+ * font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)'
+ in some setf expressions. (Bug#2159)
+
2011-03-08 Chong Yidong <cyd@stupidchicken.com>
* custom.el (custom-available-themes): Return themes in
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b7b617fcffe..988e821d7e2 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2242,7 +2242,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
"\\)\\)\\>"
;; Any whitespace and defined object.
"[ \t'\(]*"
- "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
+ "\\(setf[ \t]+\\sw+\\|\\sw+\\)?")
(1 font-lock-keyword-face)
(9 (cond ((match-beginning 3) font-lock-function-name-face)
((match-beginning 6) font-lock-variable-name-face)