Merge from origin/emacs-25

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

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 735c2cbf1ede30e2953bda7195acc13815bacbc0..92e56431b7ee8168cfb69225793c1c6d8b716922 100644 (file)
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -1,6 +1,6 @@
 ;;; cc-menus.el --- imenu support for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2016 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
@@ -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