[Emacs-diffs] /srv/bzr/emacs/trunk r111231: * src/xdisp.c (select_frame_for_redisplay): Keep selected_window and

[Stefan Monnier]

------------------------------------------------------------
revno: 111231
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-14 10:38:50 -0500
message:
  * src/xdisp.c (select_frame_for_redisplay): Keep selected_window and
  selected_frame in sync.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-14 14:05:01 +0000
+++ b/src/ChangeLog     2012-12-14 15:38:50 +0000
@@ -1,3 +1,8 @@
+2012-12-14  Stefan Monnier  <address@hidden>
+
+       * xdisp.c (select_frame_for_redisplay): Keep selected_window and
+       selected_frame in sync.
+
 2012-12-14  Eli Zaretskii  <address@hidden>
 
        * w32.c (stat_worker): If w32_stat_get_owner_group is zero, do not
@@ -5,8 +10,8 @@
        security APIs.  This is to make most callers of 'stat' and
        'lstat', which don't need that information, much faster.
 
-       * dired.c (Ffile_attributes) [WINDOWSNT]: Set
-       w32_stat_get_owner_group to a non-zero value, to request accurate
+       * dired.c (Ffile_attributes) [WINDOWSNT]:
+       Set w32_stat_get_owner_group to a non-zero value, to request accurate
        owner and group information from 'lstat'.
 
 2012-12-13  Paul Eggert  <address@hidden>
@@ -138,8 +143,8 @@
        * emacs.c (main): Call cache_system_info early in startup; we
        previously weren't calling it in Cygwin builds.
 
-       * Makefile.in (ntsource, WINDRES, W32_RES, address@hidden): Teach
-       the autoconf build system how to compile a Windows resource file
+       * Makefile.in (ntsource, WINDRES, W32_RES, address@hidden):
+       Teach the autoconf build system how to compile a Windows resource file
        and link it to Emacs.
 
 2012-12-10  Dmitry Antipov  <address@hidden>
@@ -686,8 +691,8 @@
        (set_frame_menubar): Adjust user.
        * w32term.h (struct x_output): Drop outdated #if 0 code.
        (struct w32_output): Use bitfields for explicit_parent,
-       asked_for_visible and menubar_active members.  Drop
-       unused pending_menu_activation member.
+       asked_for_visible and menubar_active members.
+       Drop unused pending_menu_activation member.
        * xterm.h (struct x_output): Drop outdated #if 0 code.
        Use bitfields for explicit_parent, asked_for_visible,
        has_been_visible and net_wm_state_hidden_seen members.
@@ -780,8 +785,8 @@
        * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
        (Fexpand_file_name) [DOS_NT]: Pass encoded file name to
        dostounix_filename.  Prevents crashes down the road, because
-       dostounix_filename assumes it gets a unibyte string.  Reported by
-       Michel de Ruiter <address@hidden>, see
+       dostounix_filename assumes it gets a unibyte string.
+       Reported by Michel de Ruiter <address@hidden>, see
        
http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00017.html
 
 2012-11-20  Stefan Monnier  <address@hidden>

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-12-13 16:55:28 +0000
+++ b/src/xdisp.c       2012-12-14 15:38:50 +0000
@@ -12966,6 +12966,7 @@
   eassert (FRAMEP (frame) && FRAME_LIVE_P (XFRAME (frame)));
 
   selected_frame = frame;
+  selected_window = XFRAME (frame)->selected_window;
 
   do {
     for (tail = XFRAME (frame)->param_alist;
@@ -12986,10 +12987,10 @@
    deleted (by an X connection failure during redisplay, for example).  */
 
 static void
-ensure_selected_frame (Lisp_Object old_frame)
+ensure_selected_frame (Lisp_Object frame)
 {
-  if (!EQ (old_frame, selected_frame) && FRAME_LIVE_P (XFRAME (old_frame)))
-    select_frame_for_redisplay (old_frame);
+  if (!EQ (frame, selected_frame) && FRAME_LIVE_P (XFRAME (frame)))
+    select_frame_for_redisplay (frame);
 }
 
 #define STOP_POLLING                                   \