* lisp/font-lock.el (lisp-font-lock-keywords-2): Treat user-error like error

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8630d478fc2e184376f8456671349557b2a98de1..bb5f3f50858a866941baf0d2a90c4f716349d85c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-06  Glenn Morris  <rgm@gnu.org>
 
+       * font-lock.el (lisp-font-lock-keywords-2):
+       Treat user-error like error.
+
        * emacs-lisp/bytecomp.el (byte-compile-char-before)
        (byte-compile-backward-char, byte-compile-backward-word):
        Handle explicit nil arguments.  (Bug#14565)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d18aea6123621c07f5bbeed9722107c77524ff20..8f4363b0bdfda971038022f6ca6ea72b37e72ea7 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2328,7 +2328,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
        (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\\|\\(?:user-\\)?error\\|signal\\)\\_>" 1 font-lock-warning-face)
        ;; Words inside \\[] tend to be for `substitute-command-keys'.
        ("\\\\\\\\\\[\\(\\(?:\\sw\\|\\s_\\)+\\)\\]"
         (1 font-lock-constant-face prepend))