aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-03-07 20:28:14 -0800
committerGlenn Morris2011-03-07 20:28:14 -0800
commitbe99652196fcb7a63a9c0022cdf80b978b509ac5 (patch)
treefa04a4cdea745c046e66942a65c519885a62cf98
parent2bb5649ecc88ee432a2313262b549e471c0df06a (diff)
downloademacs-be99652196fcb7a63a9c0022cdf80b978b509ac5.tar.gz
emacs-be99652196fcb7a63a9c0022cdf80b978b509ac5.zip
font-lock.el tweak for bug#2159.
* lisp/font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)' in some setf expressions.
-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 @@
12011-03-08 Glenn Morris <rgm@gnu.org>
2
3 * font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)'
4 in some setf expressions. (Bug#2159)
5
12011-03-08 Chong Yidong <cyd@stupidchicken.com> 62011-03-08 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * custom.el (custom-available-themes): Return themes in 8 * 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
2242 "\\)\\)\\>" 2242 "\\)\\)\\>"
2243 ;; Any whitespace and defined object. 2243 ;; Any whitespace and defined object.
2244 "[ \t'\(]*" 2244 "[ \t'\(]*"
2245 "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?") 2245 "\\(setf[ \t]+\\sw+\\|\\sw+\\)?")
2246 (1 font-lock-keyword-face) 2246 (1 font-lock-keyword-face)
2247 (9 (cond ((match-beginning 3) font-lock-function-name-face) 2247 (9 (cond ((match-beginning 3) font-lock-function-name-face)
2248 ((match-beginning 6) font-lock-variable-name-face) 2248 ((match-beginning 6) font-lock-variable-name-face)