diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-02 23:31:52 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-02 23:31:52 -0800 |
| commit | 91917dd58ec5278e555b9c693a830749083e8f89 (patch) | |
| tree | 3b0c8104106f6dec7873378bccc1273e587f6051 /lisp/emacs-lisp/lisp-mode.el | |
| parent | c988877f436bbbb285a0b34f5e037f7758dd6349 (diff) | |
| parent | 9f2f14a0725211b13a744573344636b57b9c98b9 (diff) | |
| download | emacs-91917dd58ec5278e555b9c693a830749083e8f89.tar.gz | |
Merge branch 'emacs-25-merge'
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 9ce0dfd49e8..3448b72c3f1 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -106,8 +106,10 @@ "define-global-minor-mode" "define-globalized-minor-mode" "define-derived-mode" "define-generic-mode" + "ert-deftest" "cl-defun" "cl-defsubst" "cl-defmacro" - "cl-define-compiler-macro" + "cl-define-compiler-macro" "cl-defgeneric" + "cl-defmethod" ;; CL. "define-compiler-macro" "define-modify-macro" "defsetf" "define-setf-expander" @@ -270,7 +272,7 @@ This will generate compile-time constants from BINDINGS." "define-derived-mode" "define-minor-mode" "define-generic-mode" "define-global-minor-mode" "define-globalized-minor-mode" "define-skeleton" - "define-widget")) + "define-widget" "ert-deftest")) (el-vdefs '("defconst" "defcustom" "defvaralias" "defvar-local" "defface")) (el-tdefs '("defgroup" "deftheme")) |