Mercurial > emacs
changeset 106184:0579465d2619
(cc-imenu-java-generic-expression): A corrected version of the patch from
2009-11-18.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Sat, 21 Nov 2009 10:32:20 +0000 |
| parents | 1bd47b596efb |
| children | f2cea199b0c4 |
| files | lisp/progmodes/cc-menus.el |
| diffstat | 1 files changed, 28 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-menus.el Sat Nov 21 10:31:01 2009 +0000 +++ b/lisp/progmodes/cc-menus.el Sat Nov 21 10:32:20 2009 +0000 @@ -150,7 +150,7 @@ `((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 @@ ;; 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]+" "\\)*" - ")" - "[ \t\n\r]*" - "{" - )) 1)) + "\\(" + "[" c-alpha "_]" + "[\]\[" c-alnum "_.]*" + "\\(" + + "<" + "[ \t\n\r]*" + "[\]\[.," c-alnum "_<> \t\n\r]*" + ">" + "\\)?" + "\\(\\[\\]\\)?" + "[ \t\n\r]+" + "\\)" + "[" c-alpha "_]" + "[" c-alnum "_]*" + "[ \t\n\r,]*" + "\\)*" + ")" + "[.," c-alnum " \t\n\r]*" + "{" + )) 1)) "Imenu generic expression for Java mode. See `imenu-generic-expression'.")