# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1271083687 0
# Node ID 3b65ff258e7f30b4e03375d2b9e25bd6d66673d3
# Parent  ff222821fc33bdde6fba5d5f485b7176227dd08b
Reverse 99594 "Correct buggy patch 99592 to cc-engine.el.".

diff -r ff222821fc33 -r 3b65ff258e7f lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 12 14:34:09 2010 +0000
+++ b/lisp/ChangeLog	Mon Apr 12 14:48:07 2010 +0000
@@ -282,11 +282,6 @@
 	* calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
 	of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
 
-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): Rename from
diff -r ff222821fc33 -r 3b65ff258e7f lisp/progmodes/cc-engine.el
--- a/lisp/progmodes/cc-engine.el	Mon Apr 12 14:34:09 2010 +0000
+++ b/lisp/progmodes/cc-engine.el	Mon Apr 12 14:48:07 2010 +0000
@@ -2591,7 +2591,7 @@
   (save-restriction
     (narrow-to-region 1 (point-max))
     (save-excursion
-      (let* ((in-macro-start   ; start of macro containing (point-max) or nil.
+      (let* ((in-macro-start   ; point-max or beginning of macro containing it
 	      (save-excursion
 		(goto-char (point-max))
 		(and (c-beginning-of-macro)
@@ -2642,8 +2642,7 @@
 	;; 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
-			   (not (eq good-pos-actual-macro-start
-				    in-macro-start)))
+			   (> in-macro-start good-pos-actual-macro-start))
 		      (1+ good-pos-actual-macro-end) ; get outside the macro as
 					; marked by a `category' text property.
 		    good-pos))