[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-langs.el, v [EMACS_22_BASE]

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Alan Mackenzie <acmacm> 08/04/06 20:34:26

Index: cc-langs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-langs.el,v
retrieving revision 1.47.2.9
retrieving revision 1.47.2.10
diff -u -b -r1.47.2.9 -r1.47.2.10
--- cc-langs.el 1 Mar 2008 08:52:25 -0000       1.47.2.9
+++ cc-langs.el 6 Apr 2008 20:34:25 -0000       1.47.2.10
@@ -445,7 +445,7 @@
 will have been saved; the return value is ignored.
 
 The function may extend the region to be fontified by setting the
-buffer local variables c-old-BEG and c-old-END.
+buffer local variables c-new-BEG and c-new-END.
 
 The function is called even when font locking is disabled.
 
@@ -728,13 +728,14 @@
        "define"))
 
 (c-lang-defconst c-opt-cpp-macro-define-start
-  ;; Regexp matching everything up to the macro body of a cpp define,
-  ;; or the end of the logical line if there is none.  Set if
-  ;; c-opt-cpp-macro-define is.
+  ;; Regexp matching everything up to the macro body of a cpp define, or the
+  ;; end of the logical line if there is none.  Submatch 1 is the name of the
+  ;; macro.  Set if c-opt-cpp-macro-define is.
   t (if (c-lang-const c-opt-cpp-macro-define)
        (concat (c-lang-const c-opt-cpp-prefix)
                (c-lang-const c-opt-cpp-macro-define)
-               "[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?"
+               "[ \t]+\\(\\(\\sw\\|_\\)+\\)\\(\([^\)]*\)\\)?"
+               ;;       ^                 ^ #defined name
                "\\([ \t]\\|\\\\\n\\)*")))
 (c-lang-defvar c-opt-cpp-macro-define-start
   (c-lang-const c-opt-cpp-macro-define-start))