# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1271084118 0
# Node ID a228af19ba66ba39492e7c566331ddeb6ad642d8
# Parent  3b65ff258e7f30b4e03375d2b9e25bd6d66673d3
Reverse 99592: "Fix bug #5649: 23.1.92; Indentation problems in C mode.".

diff -r 3b65ff258e7f -r a228af19ba66 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 12 14:48:07 2010 +0000
+++ b/lisp/ChangeLog	Mon Apr 12 14:55:18 2010 +0000
@@ -293,11 +293,6 @@
 	(otf-script-alist): Likewise.
 	(setup-default-fontset): Likewise.  Re-fix :otf spec.
 
-2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
-
-	* cc-engine.el (c-remove-stale-state-cache): Take account of when
-	`good-pos' is in the same macro as `here'.  Fixes bug#5649.
-
 2010-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* menu-bar.el (menu-bar-manuals-menu): Fix typo.
diff -r 3b65ff258e7f -r a228af19ba66 lisp/progmodes/cc-engine.el
--- a/lisp/progmodes/cc-engine.el	Mon Apr 12 14:48:07 2010 +0000
+++ b/lisp/progmodes/cc-engine.el	Mon Apr 12 14:55:18 2010 +0000
@@ -2641,8 +2641,7 @@
 	;; (car c-state-cache).  There can be no open parens/braces/brackets
 	;; 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))
+	(setq pos (if good-pos-actual-macro-end
 		      (1+ good-pos-actual-macro-end) ; get outside the macro as
 					; marked by a `category' text property.
 		    good-pos))