From: Leo Liu <sdl.web@gmail.com>
Date: Mon, 11 Apr 2016 12:19:38 +0000 (+0800)
Subject: Fix last change on 2016-01-02
X-Git-Tag: emacs-25.0.93~43
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/bb30fa951c23911f5c3a14d9d46d1a3260a50fe0?hp=488a72f8e390d5da37da3bb7792e1d6ca5079b07

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

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