From: Alan Mackenzie <acm@muc.de>
Date: Mon, 14 Jan 2008 19:17:31 +0000 (+0000)
Subject: (c-guess-basic-syntax): prevent a macro call inside a struct being
X-Git-Tag: emacs-pretest-22.1.90~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f189315dde3522f7fc76261d85e54563d10ad437;p=emacs.git

(c-guess-basic-syntax): prevent a macro call inside a struct being
recognised as a K&R argument.
---

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 3f86e931d34..8596aaad4c2 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8293,6 +8293,7 @@ comment at the start of cc-engine.el for more info."
 
 	   ;; CASE 5H: we could be looking at subsequent knr-argdecls
 	   ((and c-recognize-knr-p
+		 (not containing-sexp)	; can't be knr inside braces.
 		 (not (eq char-before-ip ?}))
 		 (save-excursion
 		   (setq placeholder (cdr (c-beginning-of-decl-1 lim)))