diff options
| author | Leo Liu <sdl.web@gmail.com> | 2016-01-02 15:48:44 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2016-01-02 15:48:44 +0800 |
| commit | 723b8bf19de21c0a2c25dc91df5ab22a3a9e2717 (patch) | |
| tree | 2ec22855dfae4cc30cf9322fac0a5381e7a8dbba /lisp/emacs-lisp/lisp-mode.el | |
| parent | 372d00a981942a5da868a33372eb29d5806f2ab3 (diff) | |
| download | emacs-723b8bf19de21c0a2c25dc91df5ab22a3a9e2717.tar.gz emacs-723b8bf19de21c0a2c25dc91df5ab22a3a9e2717.tar.bz2 emacs-723b8bf19de21c0a2c25dc91df5ab22a3a9e2717.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
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)) |