# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1206555107 0
# Node ID 16142d1d9f3335fc0294a43b0e02d0c2914e99a7
# Parent  cc31ce92f833612f3f62ae6604921dbc210420ee
(redisplay_internal): Reset selected_frame earlier.

diff -r cc31ce92f833 -r 16142d1d9f33 src/ChangeLog
--- a/src/ChangeLog	Wed Mar 26 18:10:51 2008 +0000
+++ b/src/ChangeLog	Wed Mar 26 18:11:47 2008 +0000
@@ -1,5 +1,7 @@
 2008-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* xdisp.c (redisplay_internal): Reset selected_frame earlier.
+
 	* indent.c (scan_for_column): Extract from current_column_1.
 	Merge with the same code from Fmove_to_column.
 	(current_column_1, Fmove_to_column): Use it.
diff -r cc31ce92f833 -r 16142d1d9f33 src/xdisp.c
--- a/src/xdisp.c	Wed Mar 26 18:10:51 2008 +0000
+++ b/src/xdisp.c	Wed Mar 26 18:11:47 2008 +0000
@@ -11636,6 +11636,14 @@
 	    }
 	}
 
+      if (!EQ (old_frame, selected_frame)
+	  && FRAME_LIVE_P (XFRAME (old_frame)))
+	/* We played a bit fast-and-loose above and allowed selected_frame
+	   and selected_window to be temporarily out-of-sync but let's make
+	   sure this stays contained.  */
+	select_frame_for_redisplay (old_frame);
+      eassert (EQ (XFRAME (selected_frame)->selected_window, selected_window));
+
       if (!pause)
 	{
 	  /* Do the mark_window_display_accurate after all windows have