summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorHelmut Eller <eller.helmut@gmail.com>2013-10-24 13:49:12 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-10-24 13:49:12 -0400
commit60db713e4d6dba18acc0f644259b61967c561c39 (patch)
treef67dd6c9f8059032c0d0449ecc6467182feca7fd /lisp/emacs-lisp/lisp-mode.el
parent8b251df61e31adc71ebe1b2b30f4f0f8645654f0 (diff)
downloademacs-60db713e4d6dba18acc0f644259b61967c561c39.tar.gz
* lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste.
Fixes: debbugs:15699
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 0b82efab122..8d4e6e3a20a 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -251,9 +251,7 @@ It has `lisp-mode-abbrev-table' as its parent."
(cons "go" (mapcar (lambda (s) (concat "cl-" s))
(remove "go" cl-lib-kw))))
t)
- (regexp-opt (append lisp-kw el-kw eieio-kw
- (cons "go" (mapcar (lambda (s) (concat "cl-" s))
- (remove "go" cl-kw))))
+ (regexp-opt (append lisp-kw cl-kw eieio-kw cl-lib-kw)
t)
;; Elisp and Common Lisp "errors".
@@ -360,7 +358,7 @@ It has `lisp-mode-abbrev-table' as its parent."
;; Control structures. Common Lisp forms.
(,(concat "(" cl-kws-re "\\_>") . 1)
;; Exit/Feature symbols as constants.
- (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\_>"
+ (,(concat "(\\(catch\\|throw\\|provide\\|require\\)\\_>"
"[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?")
(1 font-lock-keyword-face)
(2 font-lock-constant-face nil t))