[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118073: Fix bug #18649 with handling C-g on MS-Wind
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r118073: Fix bug #18649 with handling C-g on MS-Windows in -nw sessions. |
Date: |
Wed, 08 Oct 2014 12:33:16 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118073
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18649
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-08 15:32:38 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32inevt.c w32inevt.c-20091113204419-o5vbwnq5f7feedwu-813
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-08 10:39:45 +0000
+++ b/src/ChangeLog 2014-10-08 12:32:38 +0000
@@ -1,5 +1,12 @@
2014-10-08 Eli Zaretskii <address@hidden>
+ * 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.
=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c 2014-09-24 07:17:51 +0000
+++ b/src/w32inevt.c 2014-10-08 12:32:38 +0000
@@ -605,7 +605,7 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118073: Fix bug #18649 with handling C-g on MS-Windows in -nw sessions.,
Eli Zaretskii <=