[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99665: cc-engine.el (c-remove-stale-state-cache): Fix off-by-one error. Fixes

[Alan Mackenzie]

------------------------------------------------------------
revno: 99665
committer: Alan Mackenzie <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-03-22 17:21:22 +0000
message:
  cc-engine.el (c-remove-stale-state-cache): Fix off-by-one error.  Fixes
  bug #5747.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-22 16:50:29 +0000
+++ b/lisp/ChangeLog    2010-03-22 17:21:22 +0000
@@ -1,3 +1,8 @@
+2010-03-22  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-engine.el (c-remove-stale-state-cache): Fix
+       off-by-one error.  Fixes bug #5747.
+
 2010-03-22  Juanma Barranquero  <address@hidden>
 
        * image-dired.el (image-dired-display-thumbs): Fix typo in docstring.

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2010-03-01 17:46:36 +0000
+++ b/lisp/progmodes/cc-engine.el       2010-03-22 17:21:22 +0000
@@ -2624,7 +2624,7 @@
                           (< (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