(lisp-imenu-generic-expression): Var defined.

(lisp-mode-variables): Set imenu-generic-expression.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f493a615d30e961796ae131680bf0de85e8b7e13..ab08912cad7fce332561f02eadba9156067b654f 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -78,6 +78,18 @@
 
 (define-abbrev-table 'lisp-mode-abbrev-table ())
 
+(defvar lisp-imenu-generic-expression
+      '(
+       (nil 
+        "^\\s-*(def\\(un\\|subst\\|macro\\|advice\\)\\s-+\\([-A-Za-z0-9+]+\\)" 2)
+       ("Variables" 
+        "^\\s-*(def\\(var\\|const\\)\\s-+\\([-A-Za-z0-9+]+\\)" 2)
+       ("Types" 
+        "^\\s-*(def\\(type\\|struct\\|class\\|ine-condition\\)\\s-+\\([-A-Za-z0-9+]+\\)" 
+        2))
+
+  "Imenu generic expression for Lisp mode.  See `imenu-generic-expression'.")
+
 (defun lisp-mode-variables (lisp-syntax)
   (cond (lisp-syntax
          (set-syntax-table lisp-mode-syntax-table)))
@@ -105,7 +117,9 @@
   (make-local-variable 'comment-column)
   (setq comment-column 40)
   (make-local-variable 'comment-indent-function)
-  (setq comment-indent-function 'lisp-comment-indent))
+  (setq comment-indent-function 'lisp-comment-indent)
+  (make-local-variable 'imenu-generic-expression)
+  (setq imenu-generic-expression lisp-imenu-generic-expression))
 \f
 (defvar shared-lisp-mode-map ()
   "Keymap for commands shared by all sorts of Lisp modes.")