procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix
  el-errs-re.
This commit is contained in:
Leo Liu 2016-01-02 15:48:44 +08:00
parent 372d00a981
commit 723b8bf19d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/lisp-mode.el
View file

@ -383,7 +383,8 @@ This will generate compile-time constants from BINDINGS."
((eq type 'type) font-lock-type-face) ((eq type 'type) font-lock-type-face)
((or (not (match-string 2)) ;; Normal defun. ((or (not (match-string 2)) ;; Normal defun.
(and (match-string 2) ;; Setf function. (and (match-string 2) ;; Setf function.
(match-string 4))) font-lock-function-name-face))) (match-string 4)))
font-lock-function-name-face)))
nil t))) nil t)))
"Subdued level highlighting for Lisp modes.") "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)) (2 font-lock-constant-face nil t))
;; Erroneous structures. ;; Erroneous structures.
(,(concat "(" el-errs-re "\\_>") (,(concat "(" el-errs-re "\\_>")
(1 font-lock-warning-face)) (1 font-lock-warning-face prepend))
;; Words inside \\[] tend to be for `substitute-command-keys'. ;; Words inside \\[] tend to be for `substitute-command-keys'.
(,(concat "\\\\\\\\\\[\\(" lisp-mode-symbol-regexp "\\)\\]") (,(concat "\\\\\\\\\\[\\(" lisp-mode-symbol-regexp "\\)\\]")
(1 font-lock-constant-face prepend)) (1 font-lock-constant-face prepend))