[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/26 18:11:49

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -b -r1.1201 -r1.1202
--- xdisp.c     19 Mar 2008 15:01:59 -0000      1.1201
+++ xdisp.c     26 Mar 2008 18:11:46 -0000      1.1202
@@ -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