(cc-imenu-java-generic-expression): A corrected version of the patch from

2009-11-18.

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 02636c02787203b14b6fffa62baa53aff19c4e53..13ee2575d5b1c911ac681a00b4412efe4df8bcce 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -150,7 +150,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
   `((nil
      ,(concat
        "[" c-alpha "_][\]\[." c-alnum "_<> ]+[ \t\n\r]+" ; type spec
-       "\\([" c-alpha "_][" c-alnum "_]+\\)" ; method name
+       "\\([" c-alpha "_][" c-alnum "_]*\\)" ; method name
        "[ \t\n\r]*"
        ;; An argument list htat is either empty or contains any number
        ;; of arguments.  An argument is any number of annotations
@@ -159,33 +159,34 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
        ;; by < typespec > possibly followed by [].
        (concat "("
                "\\("
-                  "[ \t\n\r]*"
-                  "\\("
-                     "@"
-                     "[" c-alpha "_]"
-                     "[" c-alnum "._]""*"
-                     "[ \t\n\r]+"
-                  "\\)*"
-                  "\\("
-                     "[" c-alpha "_]"
-                     "[\]\[" c-alnum "_.]*"
-                     "\\("
-                        "<"
-                        "[ \t\n\r]*"
-                        "[\]\[.," c-alnum "_<> \t\n\r]*"
-                        ">"
-                     "\\)?"
-                     "\\(\\[\\]\\)?"
-                     "[ \t\n\r]+"
-                  "\\)"
-                 "[" c-alpha "_]"
-                 "[" c-alnum "_]*"
-                 "[ \t\n\r,]*"
+               "[ \t\n\r]*"
+               "\\("
+               "@"
+               "[" c-alpha "_]"
+               "[" c-alnum "._]""*"
+               "[ \t\n\r]+"
+               "\\)*"
+               "\\("
+               "[" c-alpha "_]"
+               "[\]\[" c-alnum "_.]*"
+               "\\("
+
+               "<"
+               "[ \t\n\r]*"
+               "[\]\[.," c-alnum "_<> \t\n\r]*"
+               ">"
+               "\\)?"
+               "\\(\\[\\]\\)?"
+               "[ \t\n\r]+"
+               "\\)"
+               "[" c-alpha "_]"
+               "[" c-alnum "_]*"
+               "[ \t\n\r,]*"
                "\\)*"
-              ")"
-           "[ \t\n\r]*"
-       "{"
-       )) 1))
+               ")"
+               "[.," c-alnum " \t\n\r]*"
+               "{"
+               )) 1))
   "Imenu generic expression for Java mode.  See
 `imenu-generic-expression'.")