From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 2 Aug 2013 16:29:16 +0000 (+0200)
Subject: lisp/emacs-lisp/lisp-mode.el: Support cl-def* expressions in imenu.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1688^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=185e3b5a2f3dc2b5163eb1fe97499c6af1edaa9c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ff543d3799..5a37f858104 100644
--- 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 af30deca4cc..3cbd6d4a585 100644
--- 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))