From: Alan Mackenzie <acm@muc.de>
Date: Mon, 1 Mar 2010 17:46:36 +0000 (+0000)
Subject: Correct buggy patch 2010-03-01T11:31:42Z!acm@muc.de to cc-engine.el.
X-Git-Tag: emacs-pretest-23.1.94~23^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb2f6eeb39101947ba73dee55e38c2e3b3a07ccf;p=emacs.git

Correct buggy patch 2010-03-01T11:31:42Z!acm@muc.de to cc-engine.el.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b9871d8291..8f2c2460aad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-01  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-engine.el (c-remove-stale-state-cache): Correct
+	previous patch.
+
 2010-03-01  Kenichi Handa  <handa@m17n.org>
 
 	* language/burmese.el (burmese-composable-pattern): Renamed from
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4797cd4a8ca..f4a8c0bf46f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2591,7 +2591,7 @@ comment at the start of cc-engine.el for more info."
   (save-restriction
     (narrow-to-region 1 (point-max))
     (save-excursion
-      (let* ((in-macro-start   ; point-max or beginning of macro containing it
+      (let* ((in-macro-start   ; start of macro containing (point-max) or nil.
 	      (save-excursion
 		(goto-char (point-max))
 		(and (c-beginning-of-macro)
@@ -2642,7 +2642,8 @@ comment at the start of cc-engine.el for more info."
 	;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
 	;; due to the interface spec to this function.
 	(setq pos (if (and good-pos-actual-macro-end
-			   (> in-macro-start good-pos-actual-macro-start))
+			   (not (eq good-pos-actual-macro-start
+				    in-macro-start)))
 		      (1+ good-pos-actual-macro-end) ; get outside the macro as
 					; marked by a `category' text property.
 		    good-pos))