[Emacs-diffs] trunk r114785: * lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste.

[Stefan Monnier]

------------------------------------------------------------
revno: 114785
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15699
author: Helmut Eller <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-24 13:49:12 -0400
message:
  * lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp-mode.el   lispmode.el-20091113204419-o5vbwnq5f7feedwu-205

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-24 17:18:46 +0000
+++ b/lisp/ChangeLog    2013-10-24 17:49:12 +0000
@@ -1,3 +1,8 @@
+2013-10-24  Helmut Eller  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste
+       (bug#15699).
+
 2013-10-24  Glenn Morris  <address@hidden>
 
        * 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  <address@hidden>
 
@@ -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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-10-08 14:57:18 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-10-24 17:49:12 +0000
@@ -251,9 +251,7 @@
                              (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 @@
        ;; 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))