From: Thierry Volpiatto Date: Wed, 27 Feb 2013 15:25:55 +0000 (-0500) Subject: * lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of X-Git-Tag: emacs-24.3.90~173^2~6^2~32 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f2c884009053be5a380a55cf2dec226fc686286c * lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of &optional. Fixes: debbugs:13819 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e69c6be3dc..822a4a2687 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-02-27 Thierry Volpiatto + + * font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of + &optional (bug#13819). + 2013-02-27 Michael Albinus * net/tramp-adb.el (tramp-adb-parse-device-names) @@ -5,8 +10,8 @@ 2013-02-26 Michael Albinus - * net/tramp-sh.el (tramp-sh-handle-insert-directory): Add - "2>/dev/null" to the ls command, in case "en_US.utf8" is not + * net/tramp-sh.el (tramp-sh-handle-insert-directory): + Add "2>/dev/null" to the ls command, in case "en_US.utf8" is not defined. POSIX environments fall back to the "C" locale then and emit a warning, which shall be suppressed. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index e5ce4db171..9436012ee5 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -2336,9 +2336,9 @@ in which C preprocessor directives are used. e.g. `asm-mode' and ("`\\(\\(?:\\sw\\|\\s_\\)\\(?:\\sw\\|\\s_\\)+\\)'" (1 font-lock-constant-face prepend)) ;; Constant values. - ("\\<:\\(?:\\sw\\|\\s_\\)+\\>" 0 font-lock-builtin-face) + ("\\_<:\\(?:\\sw\\|\\s_\\)+\\_>" 0 font-lock-builtin-face) ;; ELisp and CLisp `&' keywords as types. - ("\\<\\&\\(?:\\sw\\|\\s_\\)+\\>" . font-lock-type-face) + ("\\_<\\&\\(?:\\sw\\|\\s_\\)+\\_>" . font-lock-type-face) ;; ELisp regexp grouping constructs ((lambda (bound) (catch 'found