# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1267465596 0
# Node ID 94dd0c99026d0ec00d8cf04636cfae2a87867660
# Parent  372a2c25619442eac04537f0d52941a1cadb7129
Correct buggy patch 99592 to cc-engine.el.

diff -r 372a2c256194 -r 94dd0c99026d lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 01 20:52:21 2010 +0900
+++ b/lisp/ChangeLog	Mon Mar 01 17:46:36 2010 +0000
@@ -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 -r 372a2c256194 -r 94dd0c99026d lisp/progmodes/cc-engine.el
--- a/lisp/progmodes/cc-engine.el	Mon Mar 01 20:52:21 2010 +0900
+++ b/lisp/progmodes/cc-engine.el	Mon Mar 01 17:46:36 2010 +0000
@@ -2591,7 +2591,7 @@
   (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 @@
 	;; 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))