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

[gnu-emacs] / lisp / emacs-lisp / lisp-mode.el

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 6dd5ffa217f969f82825eb658fad45ec5b692fad..55c91bb6faf8c7cccb31d359ef87dfbba8dba8e4 100644 (file)
--- 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'.")