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

part of "(error-foo)".
This commit is contained in:
Stefan Monnier 2013-03-25 09:47:32 -04:00
parent ddfa3cb434
commit b234d92c06
2 changed files with 9 additions and 4 deletions

View file

@ -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).

View file

@ -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))