diff options
| author | Eli Zaretskii | 2014-10-08 15:32:38 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-08 15:32:38 +0300 |
| commit | c35e776245915b96e9e80dec5354d087fcdc18ff (patch) | |
| tree | ef4e7a5eefcb4f63f6c53ee316e04743111a23de /src/ChangeLog | |
| parent | d295469e8e3aa3d3ee0543aea1a59aad63c467dc (diff) | |
| download | emacs-c35e776245915b96e9e80dec5354d087fcdc18ff.tar.gz emacs-c35e776245915b96e9e80dec5354d087fcdc18ff.zip | |
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.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6acd46594b0..07e4a148ba2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2014-10-08 Eli Zaretskii <eliz@gnu.org> | 1 | 2014-10-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * w32inevt.c (maybe_generate_resize_event): Pass non-zero as the | ||
| 4 | DELAY argument to change_frame_size, so that the frame size | ||
| 5 | changes, if any are needed, are delayed until the next redisplay. | ||
| 6 | This is to avoid a too early QUIT inside change_frame_size, when | ||
| 7 | it calls Lisp in frame_windows_min_size, in case one of the events | ||
| 8 | we've read sets the quit-flag. (Bug#18649) | ||
| 9 | |||
| 3 | * w32fns.c (check_x_display_info): Accept terminal objects as | 10 | * w32fns.c (check_x_display_info): Accept terminal objects as |
| 4 | argument, to follow what xfns.c does. | 11 | argument, to follow what xfns.c does. |
| 5 | 12 | ||