lisp/emacs-lisp/lisp-mode.el: Support cl-def* expressions in imenu.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ff543d37999d4e219be4ed2cfaf87380f5f7fcf..5a37f8581040830885a8a4958392963d5244bdcd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-08-02  Juanma Barranquero  <lekktu@gmail.com>
 
+       * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+       Add cl-def* expressions.
+
        * frameset.el (frameset-filter-params): Fix order of arguments.
 
 2013-08-02  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index af30deca4cc534bd49a7f7a93b49378d00da33bd..3cbd6d4a585c2a24c53e8c8632dc2e851782e813 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -110,7 +110,9 @@ It has `lisp-mode-abbrev-table' as its parent."
                                "define-compiler-macro" "define-modify-macro"
                                "defsetf" "define-setf-expander"
                                "define-method-combination"
-                               "defgeneric" "defmethod") t))
+                               "defgeneric" "defmethod"
+                               "cl-defun" "cl-defsubst" "cl-defmacro"
+                               "cl-define-compiler-macro") t))
                           "\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
         2)
    (list (purecopy "Variables")
@@ -132,7 +134,8 @@ It has `lisp-mode-abbrev-table' as its parent."
                             (regexp-opt
                              '("defgroup" "deftheme" "deftype" "defstruct"
                                "defclass" "define-condition" "define-widget"
-                               "defface" "defpackage") t))
+                               "defface" "defpackage" "cl-deftype"
+                               "cl-defstruct") t))
                           "\\s-+'?\\(\\(\\sw\\|\\s_\\)+\\)"))
         2))