diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-02-21 15:25:01 +0000 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-02-21 15:25:01 +0000 |
| commit | de17b43370fa8549531d34c27d3cbcfb24725c6d (patch) | |
| tree | 07d28ce99e4f2e1b10654001c5205e36f65c3e80 /lisp/emacs-lisp/lisp-mode.el | |
| parent | 81c34a35aab53978bc2f3608dff3751030d0e914 (diff) | |
| parent | 3b4bd4be1dfa8717cb6911bd57c4c7d9d13614b4 (diff) | |
| download | emacs-de17b43370fa8549531d34c27d3cbcfb24725c6d.tar.gz emacs-de17b43370fa8549531d34c27d3cbcfb24725c6d.tar.bz2 emacs-de17b43370fa8549531d34c27d3cbcfb24725c6d.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f66122d6d72..3b0f5493eeb 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -456,7 +456,7 @@ This will generate compile-time constants from BINDINGS." (,(concat "\\_<:" lisp-mode-symbol-regexp "\\_>") (0 font-lock-builtin-face)) ;; ELisp and CLisp `&' keywords as types. - (,(concat "\\_<\\&" lisp-mode-symbol-regexp "\\_>") + (,(concat "\\_<&" lisp-mode-symbol-regexp "\\_>") . font-lock-type-face) ;; ELisp regexp grouping constructs (,(lambda (bound) @@ -511,7 +511,7 @@ This will generate compile-time constants from BINDINGS." (,(concat "\\_<:" lisp-mode-symbol-regexp "\\_>") (0 font-lock-builtin-face)) ;; ELisp and CLisp `&' keywords as types. - (,(concat "\\_<\\&" lisp-mode-symbol-regexp "\\_>") + (,(concat "\\_<&" lisp-mode-symbol-regexp "\\_>") . font-lock-type-face) ;; This is too general -- rms. ;; A user complained that he has functions whose names start with `do' @@ -750,7 +750,7 @@ or to switch back to an existing one." (setq-local lisp-indent-function 'common-lisp-indent-function) (setq-local find-tag-default-function 'lisp-find-tag-default) (setq-local comment-start-skip - "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *") + "\\(\\(^\\|[^\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *") (setq imenu-case-fold-search t)) (defun lisp-find-tag-default () |