[Emacs-diffs] /srv/bzr/emacs/trunk r101443: (c-forward-<>-arglist-recur): Fix an infinite recursion.

[Alan Mackenzie]

------------------------------------------------------------
revno: 101443
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-15 18:03:25 +0000
message:
  (c-forward-<>-arglist-recur): Fix an infinite recursion.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-15 17:51:15 +0000
+++ b/lisp/ChangeLog    2010-09-15 18:03:25 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2010-09-15 17:51:15 +0000
+++ b/lisp/progmodes/cc-engine.el       2010-09-15 18:03:25 +0000
@@ -5479,16 +5479,14 @@
 
                  (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) ?>)