Skip to content

GitLab

Commit 60db713e authored by Helmut Eller's avatar Helmut Eller Committed by Stefan Monnier
Browse files

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

Fixes: debbugs:15699
parent 8b251df6
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
lisp/ChangeLog
View file @ 60db713e
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>
......
lisp/emacs-lisp/lisp-mode.el
View file @ 60db713e
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment