(c-forward-<>-arglist-recur): Fix an infinite recursion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70052409d6657e061682b55f951718384aabacdd..7731c6686b784357928d780e7a41c8ae170a1406 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Correct the
        indentation.
+       (c-forward-<>-arglist-recur): Fix an infinite recursion.
 
 2010-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 195d4f6cf71284bd9f8a433d6c5ae7ea33bd0454..2a24bf1ce909fce27a2ff684423f7887baa28162 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5479,16 +5479,14 @@ comment at the start of cc-engine.el for more info."
 
                  (setq pos (point))
 
-                 (or
-                  ;; Note: These regexps exploit the match order in \| so
-                  ;; that "<>" is matched by "<" rather than "[^>:-]>".
-                  (c-syntactic-re-search-forward
-                   ;; Stop on ',', '|', '&', '+' and '-' to catch
-                   ;; common binary operators that could be between
-                   ;; two comparison expressions "a<b" and "c>d".
-                   "[<;{},|+&-]\\|[>)]"
-                   nil t t)
-                  t))
+                 ;; Note: These regexps exploit the match order in \| so
+                 ;; that "<>" is matched by "<" rather than "[^>:-]>".
+                 (c-syntactic-re-search-forward
+                  ;; Stop on ',', '|', '&', '+' and '-' to catch
+                  ;; common binary operators that could be between
+                  ;; two comparison expressions "a<b" and "c>d".
+                  "[<;{},|+&-]\\|[>)]"
+                  nil t t))
 
                (cond
                 ((eq (char-before) ?>)