2 files changed, 8 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 38fa72b0506..95fdd2da94e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32_read_socket) <WM_KILLFOCUS>: Call
+        w32_detect_focus_change instead of doing part of its job by hand.
+        This fixes the problem whereby FOCUS_OUT events were not sent to
+        the event queue.
+
 2013-07-26  Eli Zaretskii  <eliz@gnu.org>
 
         * process.c (Fprocess_list): Doc fix.
diff --git a/src/w32term.c b/src/w32term.c
index 0b22fd178e4..a596a487f3d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4923,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