aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 73040221eaa..c1e7af56998 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
445will have been saved; the return value is ignored. 445will have been saved; the return value is ignored.
446 446
447The function may extend the region to be fontified by setting the 447The function may extend the region to be fontified by setting the
448buffer local variables c-old-BEG and c-old-END. 448buffer local variables c-new-BEG and c-new-END.
449 449
450The function is called even when font locking is disabled. 450The function is called even when font locking is disabled.
451 451
@@ -728,13 +728,14 @@ definition, or nil if the language doesn't have any."
728 "define")) 728 "define"))
729 729
730(c-lang-defconst c-opt-cpp-macro-define-start 730(c-lang-defconst c-opt-cpp-macro-define-start
731 ;; Regexp matching everything up to the macro body of a cpp define, 731 ;; Regexp matching everything up to the macro body of a cpp define, or the
732 ;; or the end of the logical line if there is none. Set if 732 ;; end of the logical line if there is none. Submatch 1 is the name of the
733 ;; c-opt-cpp-macro-define is. 733 ;; macro. Set if c-opt-cpp-macro-define is.
734 t (if (c-lang-const c-opt-cpp-macro-define) 734 t (if (c-lang-const c-opt-cpp-macro-define)
735 (concat (c-lang-const c-opt-cpp-prefix) 735 (concat (c-lang-const c-opt-cpp-prefix)
736 (c-lang-const c-opt-cpp-macro-define) 736 (c-lang-const c-opt-cpp-macro-define)
737 "[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?" 737 "[ \t]+\\(\\(\\sw\\|_\\)+\\)\\(\([^\)]*\)\\)?"
738 ;; ^ ^ #defined name
738 "\\([ \t]\\|\\\\\n\\)*"))) 739 "\\([ \t]\\|\\\\\n\\)*")))
739(c-lang-defvar c-opt-cpp-macro-define-start 740(c-lang-defvar c-opt-cpp-macro-define-start
740 (c-lang-const c-opt-cpp-macro-define-start)) 741 (c-lang-const c-opt-cpp-macro-define-start))