Merge some of the differences from the standalone CC-mode.

[gnu-emacs] / lisp / progmodes / cc-menus.el

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 735c2cbf1ede30e2953bda7195acc13815bacbc0..ae26e9b85c95e079cd3a5e54e8cc204b27d9a81c 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -269,7 +269,7 @@ nested angle brackets constructs."
        "\\("                                 ; method name which gets captured
                                              ; into index
          "[" c-alpha "_]"
-         "[" c-alnum "_]*"
+        "[" c-alnum "_]*"
        "\\)"
        "[ \t\n\r]*"
        ;; An argument list that contains zero or more arguments.
@@ -521,4 +521,8 @@ Example:
 \f
 (cc-provide 'cc-menus)
 
+;;; Local Variables:
+;;; indent-tabs-mode: t
+;;; tab-width: 8
+;;; End:
 ;;; cc-menus.el ends here