(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 f05d663247360f5162c7316b18d1f31c41381a53..f69382c9d70a824c878896d81d7a08247e6af24a 100644 (file)
--- 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....?