Commit c35e7762 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #18649 with handling C-g on MS-Windows in -nw sessions.

 src/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.
parent d295469e
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.
 
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment