andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Alan Mackenzie 2010-09-15 18:03:25 +00:00
parent 22c3ce9729
commit a4ee83ccd4
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -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>

18
lisp/progmodes/cc-engine.el
View file

@ -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) ?>)