mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-09 15:50:21 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Glenn Morris 2013-06-06 17:35:45 -04:00
parent c5de26b468
commit d0341459c1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2013-06-06 Glenn Morris <rgm@gnu.org> 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) * emacs-lisp/bytecomp.el (byte-compile-char-before)
(byte-compile-backward-char, byte-compile-backward-word): (byte-compile-backward-char, byte-compile-backward-word):
Handle explicit nil arguments. (Bug#14565) Handle explicit nil arguments. (Bug#14565)

2
lisp/font-lock.el
View File

@ -2328,7 +2328,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
(1 font-lock-keyword-face) (1 font-lock-keyword-face)
(2 font-lock-constant-face nil t)) (2 font-lock-constant-face nil t))
;; Erroneous structures. ;; 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'. ;; Words inside \\[] tend to be for `substitute-command-keys'.
("\\\\\\\\\\[\\(\\(?:\\sw\\|\\s_\\)+\\)\\]" ("\\\\\\\\\\[\\(\\(?:\\sw\\|\\s_\\)+\\)\\]"
(1 font-lock-constant-face prepend)) (1 font-lock-constant-face prepend))