From bb30fa951c23911f5c3a14d9d46d1a3260a50fe0 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Mon, 11 Apr 2016 20:19:38 +0800 Subject: [PATCH 1/1] Fix last change on 2016-01-02 * lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Move `cl-errs-re' before `lisp--el-match-keyword'; don't use `prepend' which highlights `cl-errs-re' even in comments or strings. --- lisp/emacs-lisp/lisp-mode.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 3f34555758..315b3d5634 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -396,6 +396,9 @@ This will generate compile-time constants from BINDINGS." lisp-el-font-lock-keywords-1 `( ;; Regexp negated char group. ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend) + ;; Erroneous structures. + (,(concat "(" el-errs-re "\\_>") + (1 font-lock-warning-face)) ;; Control structures. Common Lisp forms. (lisp--el-match-keyword . 1) ;; Exit/Feature symbols as constants. @@ -403,9 +406,6 @@ This will generate compile-time constants from BINDINGS." "[ \t']*\\(" lisp-mode-symbol-regexp "\\)?") (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) - ;; Erroneous structures. - (,(concat "(" el-errs-re "\\_>") - (1 font-lock-warning-face prepend)) ;; Words inside \\[] tend to be for `substitute-command-keys'. (,(concat "\\\\\\\\\\[\\(" lisp-mode-symbol-regexp "\\)\\]") (1 font-lock-constant-face prepend)) -- 2.39.2