Mercurial > emacs
changeset 110373:3e42bd1221cd
(c-forward-<>-arglist-recur): Fix an infinite recursion.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Wed, 15 Sep 2010 18:03:25 +0000 |
| parents | 8e1e2c124dec |
| children | 932697ced7aa |
| files | lisp/ChangeLog lisp/progmodes/cc-engine.el |
| diffstat | 2 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 15 17:51:15 2010 +0000 +++ b/lisp/ChangeLog Wed Sep 15 18:03:25 2010 +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 <monnier@iro.umontreal.ca>
--- a/lisp/progmodes/cc-engine.el Wed Sep 15 17:51:15 2010 +0000 +++ b/lisp/progmodes/cc-engine.el Wed Sep 15 18:03:25 2010 +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) ?>)