Merge from mainline.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 2fe3fe07462..a596a487f3d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4360,8 +4360,9 @@ w32_read_socket (struct terminal *terminal,
                   SET_FRAME_VISIBLE (f, 1);
                   SET_FRAME_ICONIFIED (f, 0);
                   SET_FRAME_GARBAGED (f);
-                  DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
-                             SDATA (f->name)));
+                  if (!f->output_data.w32->asked_for_visible)
+                    DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
+                               SDATA (f->name)));
 
                   /* WM_PAINT serves as MapNotify as well, so report
                      visibility changes properly.  */
@@ -4819,7 +4820,8 @@ w32_read_socket (struct terminal *terminal,
                   {
                     bool iconified = FRAME_ICONIFIED_P (f);
 
-                    SET_FRAME_VISIBLE (f, 1);
+                    if (iconified)
+                      SET_FRAME_VISIBLE (f, 1);
                     SET_FRAME_ICONIFIED (f, 0);
 
                     /* wait_reading_process_output will notice this
@@ -4921,16 +4923,11 @@ w32_read_socket (struct terminal *terminal,
           break;
 
         case WM_KILLFOCUS:
+          w32_detect_focus_change (dpyinfo, &msg, &inev);
           f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd);
 
           if (f)
             {
-              if (f == dpyinfo->w32_focus_event_frame)
-                dpyinfo->w32_focus_event_frame = 0;
-
-              if (f == dpyinfo->w32_focus_frame)
-                x_new_focus_frame (dpyinfo, 0);
-
               if (f == hlinfo->mouse_face_mouse_frame)
                 {
                   /* If we move outside the frame, then we're
@@ -6129,6 +6126,9 @@ x_iconify_frame (struct frame *f)
   /* Simulate the user minimizing the frame.  */
   SendMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MINIMIZE, 0);
 
+  SET_FRAME_VISIBLE (f, 0);
+  SET_FRAME_ICONIFIED (f, 1);
+
   unblock_input ();
 }