[Emacs-diffs] /srv/bzr/emacs/trunk r111887: * lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of

[Stefan Monnier]

------------------------------------------------------------
revno: 111887
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13819
author: Thierry Volpiatto <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-02-27 10:25:55 -0500
message:
  * lisp/font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
  &optional.
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-27 09:20:13 +0000
+++ b/lisp/ChangeLog    2013-02-27 15:25:55 +0000
@@ -1,3 +1,8 @@
+2013-02-27  Thierry Volpiatto  <address@hidden>
+
+       * font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
+       &optional (bug#13819).
+
 2013-02-27  Michael Albinus  <address@hidden>
 
        * net/tramp-adb.el (tramp-adb-parse-device-names)
@@ -5,8 +10,8 @@
 
 2013-02-26  Michael Albinus  <address@hidden>
 
-       * 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.
 

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2013-02-17 16:58:12 +0000
+++ b/lisp/font-lock.el 2013-02-27 15:25:55 +0000
@@ -2336,9 +2336,9 @@
        ("`\\(\\(?:\\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