changeset 107933:ff222821fc33

Undo change 99665 "Fix off-by-one error. Fixes bug #5747."
author Alan Mackenzie <acm@muc.de>
date Mon, 12 Apr 2010 14:34:09 +0000
parents 9b8dfcd5e0b0
children 3b65ff258e7f
files lisp/ChangeLog lisp/progmodes/cc-engine.el
diffstat 2 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Apr 10 19:31:01 2010 +0900
+++ b/lisp/ChangeLog	Mon Apr 12 14:34:09 2010 +0000
@@ -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.
--- a/lisp/progmodes/cc-engine.el	Sat Apr 10 19:31:01 2010 +0900
+++ b/lisp/progmodes/cc-engine.el	Mon Apr 12 14:34:09 2010 +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