(lisp-imenu-generic-expression): Accept `*', `|',

and `:' in symbol names.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 89bac6d80f932d1b7622102ef3cfef28d6e91fc2..a48a7efe42159c101e4e0db612f31acdc2ff66c4 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -82,11 +82,11 @@
 (defvar lisp-imenu-generic-expression
       '(
        (nil 
-        "^\\s-*(def\\(un\\|subst\\|macro\\|advice\\)\\s-+\\([-A-Za-z0-9+]+\\)" 2)
+        "^\\s-*(def\\(un\\|subst\\|macro\\|advice\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" 2)
        ("Variables" 
-        "^\\s-*(def\\(var\\|const\\)\\s-+\\([-A-Za-z0-9+]+\\)" 2)
+        "^\\s-*(def\\(var\\|const\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" 2)
        ("Types" 
-        "^\\s-*(def\\(type\\|struct\\|class\\|ine-condition\\)\\s-+\\([-A-Za-z0-9+]+\\)" 
+        "^\\s-*(def\\(type\\|struct\\|class\\|ine-condition\\)\\s-+\\([-A-Za-z0-9+*|:]+\\)" 
         2))
 
   "Imenu generic expression for Lisp mode.  See `imenu-generic-expression'.")