[Emacs-diffs] /srv/bzr/emacs/trunk r112873: * lisp/font-lock.el (lisp-font-lock-keywords-2): Treat user-error like error

[Glenn Morris]

------------------------------------------------------------
revno: 112873
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-06 17:35:45 -0400
message:
  * lisp/font-lock.el (lisp-font-lock-keywords-2): Treat user-error like error
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-06 21:04:43 +0000
+++ b/lisp/ChangeLog    2013-06-06 21:35:45 +0000
@@ -1,5 +1,8 @@
 2013-06-06  Glenn Morris  <address@hidden>
 
+       * 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)

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2013-05-24 06:59:55 +0000
+++ b/lisp/font-lock.el 2013-06-06 21:35:45 +0000
@@ -2328,7 +2328,7 @@
        (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))