* lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"

part of "(error-foo)".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c27f5d25a0ee69083b242818ea041eea6060d871..ffd158abe60ec0a38c308d8d741c8cb0559a9829 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error"
+       part of "(error-foo)".
+
 2013-03-24  Juri Linkov  <juri@jurta.org>
 
        * replace.el (list-matching-lines-prefix-face): New defcustom.
@@ -24,8 +29,8 @@
 
 2013-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 
-       * 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).
 

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 9436012ee59dbe21165299c7ca0c906299a972e6..f9b75243494b4df415454946bfa3c841178a1917 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2323,12 +2323,12 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
          "\\_>")
          . 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))