2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6acd46594b0..07e4a148ba2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2014-10-08  Eli Zaretskii  <eliz@gnu.org>
 
+        * w32inevt.c (maybe_generate_resize_event): Pass non-zero as the
+        DELAY argument to change_frame_size, so that the frame size
+        changes, if any are needed, are delayed until the next redisplay.
+        This is to avoid a too early QUIT inside change_frame_size, when
+        it calls Lisp in frame_windows_min_size, in case one of the events
+        we've read sets the quit-flag.  (Bug#18649)
+
         * w32fns.c (check_x_display_info): Accept terminal objects as
         argument, to follow what xfns.c does.
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 3dcae11cc48..7d10d88155c 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -605,7 +605,7 @@ maybe_generate_resize_event (void)
   change_frame_size (f,
                      1 + info.srWindow.Right - info.srWindow.Left,
                      1 + info.srWindow.Bottom - info.srWindow.Top
-                     - FRAME_MENU_BAR_LINES (f), 0, 0, 0, 0);
+                     - FRAME_MENU_BAR_LINES (f), 0, 1, 0, 0);
 }
 
 #if HAVE_W32NOTIFY