aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorThien-Thi Nguyen2006-01-24 13:38:07 +0000
committerThien-Thi Nguyen2006-01-24 13:38:07 +0000
commit317921ec180582ce33123d71fcc1beb1fe33bd19 (patch)
tree775dc06b1eae3c31fa882d4617f63f0c3da547de /lisp
parentbf7f1d30f5e15d96df040bffe931275de92b5ebb (diff)
downloademacs-317921ec180582ce33123d71fcc1beb1fe33bd19.tar.gz
emacs-317921ec180582ce33123d71fcc1beb1fe33bd19.zip
(lisp-font-lock-keywords-2):
Recognize "& keywords" only at word boundaries.
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 9406f3809f1..93231f3ecee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-01-24 Tobias C. Rittweiler <tcr@freebits.de> (tiny change)
2
3 * font-lock.el (lisp-font-lock-keywords-2):
4 Recognize "& keywords" only at word boundaries.
5
12006-01-24 Nick Roberts <nickrob@snap.net.nz> 62006-01-24 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * thumbs.el (thumbs-extra-images): New variable. Make it buffer-local 8 * thumbs.el (thumbs-extra-images): New variable. Make it buffer-local
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index be857838ad2..53f2df11d1d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2126,7 +2126,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
2126 ;; Constant values. 2126 ;; Constant values.
2127 ("\\<:\\sw+\\>" 0 font-lock-builtin-face) 2127 ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
2128 ;; ELisp and CLisp `&' keywords as types. 2128 ;; ELisp and CLisp `&' keywords as types.
2129 ("\\&\\sw+\\>" . font-lock-type-face) 2129 ("\\<\\&\\sw+\\>" . font-lock-type-face)
2130 ;; ELisp regexp grouping constructs 2130 ;; ELisp regexp grouping constructs
2131 ((lambda (bound) 2131 ((lambda (bound)
2132 (catch 'found 2132 (catch 'found