diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/font-lock.el | 2 |
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 @@ | |||
| 1 | 2011-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 | |||
| 1 | 2011-03-08 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-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) |