diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-03 11:46:03 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-03 11:46:03 +0100 |
| commit | 5498c3509b2a69207c807d23c6013b148ce37bc4 (patch) | |
| tree | 55872008d9154ee0479d8d693bf83f86fe4ee2f2 /lisp/emacs-lisp/lisp-mode.el | |
| parent | 2d27e24a37b514e7c07c120cc4f3984ae3b0c53e (diff) | |
| parent | fb6d826c69939c2d016c1b824d4e9bcb53d9e643 (diff) | |
| download | emacs-5498c3509b2a69207c807d23c6013b148ce37bc4.tar.gz | |
Merge remote-tracking branch 'origin/master' into xwidget_mvp
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")) |