aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/cc-langs.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 73040221ea..c1e7af5699 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -445,7 +445,7 @@ exit; on entry, the buffer will have been widened and match-data
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 @@ definition, or nil if the language doesn't have any."
"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))