1 files changed, 5 insertions, 5 deletions

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....?