* lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste.

Fixes: debbugs:15699

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9b1bcb602a504f2d32f1a497c395e404a0b10cb..12dfe1e1869a3d3b07b19e6136033074eb3985ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-24  Helmut Eller  <eller.helmut@gmail.com>
+
+       * emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste
+       (bug#15699).
+
 2013-10-24  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (abs_top_srcdir): Remove.
@@ -7,8 +12,8 @@
 
        * Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
        ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
-       ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Call
-       unmsys--file-name before expand-file-name, not after it.
+       ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
+       Call unmsys--file-name before expand-file-name, not after it.
 
 2013-10-24  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -21,8 +26,8 @@
        (ert-test-result-expected-p, ert--stats, ert-stats-completed)
        (ert--stats-set-test-and-result, ert-char-for-test-result)
        (ert-string-for-test-result, ert-run-tests-batch)
-       (ert--results-update-ewoc-hf, ert-run-tests-interactively): Handle
-       skipped tests.
+       (ert--results-update-ewoc-hf, ert-run-tests-interactively):
+       Handle skipped tests.
 
 2013-10-24  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 0b82efab122d6a8de0467cd8741dcfccfff52be8..8d4e6e3a20a41068530c1905238389e10bfdcfe3 100644 (file)
--- 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))