[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-menus.el

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-menus.el
diff -c emacs/lisp/progmodes/cc-menus.el:1.21 
emacs/lisp/progmodes/cc-menus.el:1.22
*** emacs/lisp/progmodes/cc-menus.el:1.21       Mon Jul 16 03:46:48 2001
--- emacs/lisp/progmodes/cc-menus.el    Sun Apr 21 20:35:36 2002
***************
*** 25,31 ****
  ;; GNU General Public License for more details.
  
  ;; You should have received a copy of the GNU General Public License
! ;; along with this program; see the file COPYING.  If not, write to
  ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  ;; Boston, MA 02111-1307, USA.
  
--- 25,31 ----
  ;; GNU General Public License for more details.
  
  ;; You should have received a copy of the GNU General Public License
! ;; along with GNU Emacs; see the file COPYING.  If not, write to
  ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  ;; Boston, MA 02111-1307, USA.
  
***************
*** 110,118 ****
         "[^()]*"                               ; no parentheses before
         "[^a-zA-Z0-9_:<>~]"                    ; match any non-identifier char
         "\\([a-zA-Z_][a-zA-Z0-9_:<>~]*\\)"     ; match function name
!        "[ \t]*("                            ; see above, BUT
!        "[ \t]*\\([^ \t(*][^)]*\\)?)"          ; the arg list must not start
!        "[ \t]*[^ \t;(]"                       ; with an asterisk or 
parentheses
         ) 1)
      ;; Special case for definitions using phony prototype macros like:
      ;; `int main _PROTO( (int argc,char *argv[]) )'.
--- 110,118 ----
         "[^()]*"                               ; no parentheses before
         "[^a-zA-Z0-9_:<>~]"                    ; match any non-identifier char
         "\\([a-zA-Z_][a-zA-Z0-9_:<>~]*\\)"     ; match function name
!        "\\([ \t\n]\\|\\\\\n\\)*("           ; see above, BUT the arg list
!        "\\([ \t\n]\\|\\\\\n\\)*\\([^ \t\n(*][^)]*\\)?)" ; must not start
!        "\\([ \t\n]\\|\\\\\n\\)*[^ \t\n;(]"    ; with an asterisk or 
parentheses
         ) 1)
      ;; Special case for definitions using phony prototype macros like:
      ;; `int main _PROTO( (int argc,char *argv[]) )'.
***************
*** 139,145 ****
           "[a-zA-Z0-9_]+"                      ; class name
           "\\(<[^>]+>\\)?"                     ; possibly explicitly 
specialized
           "\\)"
!          "[ \t\n]*[:{]"
           ) 3))
    "Imenu generic expression for C++ mode.  See `imenu-generic-expression'.")
   
--- 139,145 ----
           "[a-zA-Z0-9_]+"                      ; class name
           "\\(<[^>]+>\\)?"                     ; possibly explicitly 
specialized
           "\\)"
!          "\\([ \t\n]\\|\\\\\n\\)*[:{]"
           ) 3))
    "Imenu generic expression for C++ mode.  See `imenu-generic-expression'.")