Undo 2010-03-15T01:38:28Z!yamaoka@jpl.org "Fix off-by-one error. Fixes bug #5747."

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe1e4b258780363b6f044e484a41e09d9dca359e..c74aef90b3c1c28ab21c5325ab4bb383abb1cc9c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -134,11 +134,6 @@
 
        * indent.el (indent-for-tab-command): Doc fix.
 
-2010-03-22  Alan Mackenzie  <acm@muc.de>
-
-       * progmodes/cc-engine.el (c-remove-stale-state-cache):
-       Fix off-by-one error.  Fixes bug #5747.
-
 2010-03-22  Juanma Barranquero  <lekktu@gmail.com>
 
        * 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 2d28d003fd5be5b346f04f8772a7e7de19a388c0..f4a8c0bf46fbd9de568564d3513b5be4e4c4a181 100644 (file)
--- 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."
                           (< (point-max) c-state-old-cpp-end)))
                  (point-max)
                (min (point-max) c-state-old-cpp-beg)))
-       (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim))
+       (while (and c-state-cache (> (c-state-cache-top-lparen) upper-lim))
          (setq c-state-cache (cdr c-state-cache)))
        ;; If `upper-lim' is inside the last recorded brace pair, remove its
        ;; RBrace and indicate we'll need to search backwards for a previous