From: Stefan Monnier Date: Mon, 25 Mar 2013 13:47:32 +0000 (-0400) Subject: * lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error" X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~98 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b234d92c0695c4f500a4a14496008f377de76f3e;p=emacs.git * 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 c27f5d25a0e..ffd158abe60 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-03-25 Stefan Monnier + + * font-lock.el (lisp-font-lock-keywords-2): Don't highlight the "error" + part of "(error-foo)". + 2013-03-24 Juri Linkov * replace.el (list-matching-lines-prefix-face): New defcustom. @@ -24,8 +29,8 @@ 2013-03-23 Dmitry Gutov - * 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 9436012ee59..f9b75243494 100644 --- 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))