[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/progmodes cc-menus.el
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] emacs/lisp/progmodes cc-menus.el |
Date: |
Sat, 21 Nov 2009 10:32:20 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 09/11/21 10:32:20
Modified files:
lisp/progmodes : cc-menus.el
Log message:
(cc-imenu-java-generic-expression): A corrected version of the patch
from
2009-11-18.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cc-menus.el?cvsroot=emacs&r1=1.44&r2=1.45
Patches:
Index: cc-menus.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-menus.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- cc-menus.el 18 Nov 2009 21:13:07 -0000 1.44
+++ cc-menus.el 21 Nov 2009 10:32:20 -0000 1.45
@@ -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
@@ -170,6 +170,7 @@
"[" c-alpha "_]"
"[\]\[" c-alnum "_.]*"
"\\("
+
"<"
"[ \t\n\r]*"
"[\]\[.," c-alnum "_<> \t\n\r]*"
@@ -183,7 +184,7 @@
"[ \t\n\r,]*"
"\\)*"
")"
- "[ \t\n\r]*"
+ "[.," c-alnum " \t\n\r]*"
"{"
)) 1))
"Imenu generic expression for Java mode. See