(lisp-imenu-generic-expression): Fix bug whereby names of length one

or names starting with a symbol-constituent character would not be returned.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bf21281c42..d9deff1cdea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-03  Martin Rudalics  <rudalics@gmx.at>  (tiny change)
+
+        * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Fix bug
+        whereby names of length one or names starting with a
+        symbol-constituent character would not be returned.
+
 2005-12-03  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
         * subr.el (atomic-change-group): Add edebug and indentation spec.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 6dd5ffa217f..55c91bb6faf 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -102,7 +102,7 @@
                                 "defsetf" "define-setf-expander"
                                 "define-method-combination"
                                 "defgeneric" "defmethod") t))
-                           "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
+                           "\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
          2)
    (list (purecopy "Variables")
          (purecopy (concat "^\\s-*("
@@ -110,7 +110,7 @@
                              (regexp-opt
                               '("defvar" "defconst" "defconstant" "defcustom"
                                 "defparameter" "define-symbol-macro") t))
-                           "\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
+                           "\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
          2)
    (list (purecopy "Types")
          (purecopy (concat "^\\s-*("
@@ -119,7 +119,7 @@
                               '("defgroup" "deftheme" "deftype" "defstruct"
                                 "defclass" "define-condition" "define-widget"
                                 "defface" "defpackage") t))
-                           "\\s-+'?\\(\\sw\\(\\sw\\|\\s_\\)+\\)"))
+                           "\\s-+'?\\(\\(\\sw\\|\\s_\\)+\\)"))
          2))
 
   "Imenu generic expression for Lisp mode.  See `imenu-generic-expression'.")