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

Fix last change on 2016-01-02

Browse source 
* 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.
This commit is contained in:
Leo Liu 2016-04-11 20:19:38 +08:00
parent 488a72f8e3
commit bb30fa951c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -396,6 +396,9 @@ This will generate compile-time constants from BINDINGS."
lisp-el-font-lock-keywords-1 lisp-el-font-lock-keywords-1
`( ;; Regexp negated char group. `( ;; Regexp negated char group.
("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend) ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)
;; Erroneous structures.
(,(concat "(" el-errs-re "\\_>")
(1 font-lock-warning-face))
;; Control structures. Common Lisp forms. ;; Control structures. Common Lisp forms.
(lisp--el-match-keyword . 1) (lisp--el-match-keyword . 1)
;; Exit/Feature symbols as constants. ;; Exit/Feature symbols as constants.
@ -403,9 +406,6 @@ This will generate compile-time constants from BINDINGS."
"[ \t']*\\(" lisp-mode-symbol-regexp "\\)?") "[ \t']*\\(" lisp-mode-symbol-regexp "\\)?")
(1 font-lock-keyword-face) (1 font-lock-keyword-face)
(2 font-lock-constant-face nil t)) (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'. ;; 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))