[Emacs-diffs] /srv/bzr/emacs/trunk r112129: * lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"

[Stefan Monnier]

------------------------------------------------------------
revno: 112129
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-25 09:47:32 -0400
message:
  * lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"
  part of "(error-foo)".
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-24 21:47:52 +0000
+++ b/lisp/ChangeLog    2013-03-25 13:47:32 +0000
@@ -1,3 +1,8 @@
+2013-03-25  Stefan Monnier  <address@hidden>
+
+       * font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"
+       part of "(error-foo)".
+
 2013-03-24  Juri Linkov  <address@hidden>
 
        * replace.el (list-matching-lines-prefix-face): New defcustom.
@@ -24,8 +29,8 @@
 
 2013-03-23  Dmitry Gutov  <address@hidden>
 
-       * emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make
-       it safe-local.
+       * emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column):
+       Make it safe-local.
 
        * vc/diff-mode.el (diff-mode-shared-map): Unbind "/" (Bug#14034).
 

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2013-02-27 15:25:55 +0000
+++ b/lisp/font-lock.el 2013-03-25 13:47:32 +0000
@@ -2323,12 +2323,12 @@
          "\\_>")
          . 1)
        ;; Exit/Feature symbols as constants.
-       (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>"
+       (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\_>"
                 "[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?")
        (1 font-lock-keyword-face)
        (2 font-lock-constant-face nil t))
        ;; Erroneous structures.
-       
("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\>" 1 
font-lock-warning-face)
+       
("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\_>" 1 
font-lock-warning-face)
        ;; Words inside \\[] tend to be for `substitute-command-keys'.
        ("\\\\\\\\\\[\\(\\(?:\\sw\\|\\s_\\)+\\)\\]"
         (1 font-lock-constant-face prepend))