diff options
| author | Alan Mackenzie | 2010-09-15 18:03:25 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2010-09-15 18:03:25 +0000 |
| commit | a4ee83ccd46d5ec32f60233951b1e8d40efaec7e (patch) | |
| tree | b1fdcb29053a200de4822443ef547f349bc33418 /lisp/progmodes | |
| parent | 22c3ce972968fcd569a6d9e398cfbfcb09bf2bdc (diff) | |
| download | emacs-a4ee83ccd46d5ec32f60233951b1e8d40efaec7e.tar.gz emacs-a4ee83ccd46d5ec32f60233951b1e8d40efaec7e.zip | |
(c-forward-<>-arglist-recur): Fix an infinite recursion.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 195d4f6cf71..2a24bf1ce90 100644 --- 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." | |||
| 5479 | 5479 | ||
| 5480 | (setq pos (point)) | 5480 | (setq pos (point)) |
| 5481 | 5481 | ||
| 5482 | (or | 5482 | ;; Note: These regexps exploit the match order in \| so |
| 5483 | ;; Note: These regexps exploit the match order in \| so | 5483 | ;; that "<>" is matched by "<" rather than "[^>:-]>". |
| 5484 | ;; that "<>" is matched by "<" rather than "[^>:-]>". | 5484 | (c-syntactic-re-search-forward |
| 5485 | (c-syntactic-re-search-forward | 5485 | ;; Stop on ',', '|', '&', '+' and '-' to catch |
| 5486 | ;; Stop on ',', '|', '&', '+' and '-' to catch | 5486 | ;; common binary operators that could be between |
| 5487 | ;; common binary operators that could be between | 5487 | ;; two comparison expressions "a<b" and "c>d". |
| 5488 | ;; two comparison expressions "a<b" and "c>d". | 5488 | "[<;{},|+&-]\\|[>)]" |
| 5489 | "[<;{},|+&-]\\|[>)]" | 5489 | nil t t)) |
| 5490 | nil t t) | ||
| 5491 | t)) | ||
| 5492 | 5490 | ||
| 5493 | (cond | 5491 | (cond |
| 5494 | ((eq (char-before) ?>) | 5492 | ((eq (char-before) ?>) |