From: Alan Mackenzie <acm@muc.de>
Date: Fri, 2 Feb 2007 23:06:41 +0000 (+0000)
Subject: (c-in-knr-argdecl): Slight correction for, e.g. "void (*hdone)();" in a
X-Git-Tag: emacs-pretest-22.0.94~439
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10489fcbefcfe810f0e691b1816611cae7a3ec36;p=emacs.git

(c-in-knr-argdecl): Slight correction for, e.g. "void (*hdone)();" in a
k&r list.  (No WS between adjacent paren groups).
---

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f05d6632473..f69382c9d70 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6256,13 +6256,13 @@ comment at the start of cc-engine.el for more info."
 
 	(catch 'knr
 	  (while t ; go round one paren/bracket construct each time round.
-	    (or (c-syntactic-skip-backward "^)]}")
-		(throw 'knr nil))	; no more bpb pairs left.
+	    (c-syntactic-skip-backward "^)]}")
 	    (cond ((eq (char-before) ?\))
 		   (setq after-rparen (point)))
-		  ((eq (char-before) ?\})
-		   (throw 'knr nil))
-		  (t (setq after-rparen nil))) ; "]"
+		  ((eq (char-before) ?\])
+		   (setq after-rparen nil))
+		  (t ; either } (hit previous defun) or no more parens/brackets
+		   (throw 'knr nil)))
 
 	    (if after-rparen
 	    ;; We're inside a paren.  Could it be our argument list....?