From: Leo Liu <sdl.web@gmail.com>
Date: Sat, 2 Jan 2016 07:48:44 +0000 (+0800)
Subject: Fix regression in font-locking cl-assert and cl-check-type
X-Git-Tag: emacs-25.0.90~295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=723b8bf19de21c0a2c25dc91df5ab22a3a9e2717;p=emacs.git

Fix regression in font-locking cl-assert and cl-check-type

* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix
  el-errs-re.
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 4bb1466c930..574ecef0cde 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -383,7 +383,8 @@ This will generate compile-time constants from BINDINGS."
                      ((eq type 'type) font-lock-type-face)
                      ((or (not (match-string 2)) ;; Normal defun.
                           (and (match-string 2)  ;; Setf function.
-                               (match-string 4))) font-lock-function-name-face)))
+                               (match-string 4)))
+                      font-lock-function-name-face)))
              nil t)))
       "Subdued level highlighting for Lisp modes.")
 
@@ -403,7 +404,7 @@ This will generate compile-time constants from BINDINGS."
            (2 font-lock-constant-face nil t))
          ;; Erroneous structures.
          (,(concat "(" el-errs-re "\\_>")
-           (1 font-lock-warning-face))
+          (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))