diff options
| author | Alan Mackenzie | 2010-04-12 14:34:09 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2010-04-12 14:34:09 +0000 |
| commit | db00cb3ae4aceedce725b8b3550830f0f0dbc4a7 (patch) | |
| tree | 94391c530aa76e33660dc3b530887421bb2fcf80 | |
| parent | 658b9b9347fdb9cdf5763990c22e63a0d617c40e (diff) | |
| download | emacs-db00cb3ae4aceedce725b8b3550830f0f0dbc4a7.tar.gz emacs-db00cb3ae4aceedce725b8b3550830f0f0dbc4a7.zip | |
Undo 2010-03-15T01:38:28Z!yamaoka@jpl.org "Fix off-by-one error. Fixes bug #5747."
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fe1e4b25878..c74aef90b3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -134,11 +134,6 @@ | |||
| 134 | 134 | ||
| 135 | * indent.el (indent-for-tab-command): Doc fix. | 135 | * indent.el (indent-for-tab-command): Doc fix. |
| 136 | 136 | ||
| 137 | 2010-03-22 Alan Mackenzie <acm@muc.de> | ||
| 138 | |||
| 139 | * progmodes/cc-engine.el (c-remove-stale-state-cache): | ||
| 140 | Fix off-by-one error. Fixes bug #5747. | ||
| 141 | |||
| 142 | 2010-03-22 Juanma Barranquero <lekktu@gmail.com> | 137 | 2010-03-22 Juanma Barranquero <lekktu@gmail.com> |
| 143 | 138 | ||
| 144 | * image-dired.el (image-dired-display-thumbs): Fix typo in docstring. | 139 | * image-dired.el (image-dired-display-thumbs): Fix typo in docstring. |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 2d28d003fd5..f4a8c0bf46f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -2624,7 +2624,7 @@ comment at the start of cc-engine.el for more info." | |||
| 2624 | (< (point-max) c-state-old-cpp-end))) | 2624 | (< (point-max) c-state-old-cpp-end))) |
| 2625 | (point-max) | 2625 | (point-max) |
| 2626 | (min (point-max) c-state-old-cpp-beg))) | 2626 | (min (point-max) c-state-old-cpp-beg))) |
| 2627 | (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim)) | 2627 | (while (and c-state-cache (> (c-state-cache-top-lparen) upper-lim)) |
| 2628 | (setq c-state-cache (cdr c-state-cache))) | 2628 | (setq c-state-cache (cdr c-state-cache))) |
| 2629 | ;; If `upper-lim' is inside the last recorded brace pair, remove its | 2629 | ;; If `upper-lim' is inside the last recorded brace pair, remove its |
| 2630 | ;; RBrace and indicate we'll need to search backwards for a previous | 2630 | ;; RBrace and indicate we'll need to search backwards for a previous |