diff options
| author | Miles Bader <miles@gnu.org> | 2008-04-18 02:56:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-04-18 02:56:45 +0000 |
| commit | d02fe47dd3be7310d1bfd6e802d1fac2ea5f5e9d (patch) | |
| tree | 9ba3090ea2e4c57322ad5104dc910eedffb40ae4 /lisp/progmodes/cc-langs.el | |
| parent | dc6ee347e3e4fe96397ef913d2ffe4901cc0c1a8 (diff) | |
| parent | bcb96719b37029024876fca1f65eab69d32aa6d8 (diff) | |
| download | emacs-d02fe47dd3be7310d1bfd6e802d1fac2ea5f5e9d.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1112
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index ed3efc66ec2..f22b75218da 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -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)) |