diff options
| author | Paul Eggert | 2016-04-24 12:48:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-24 12:48:34 -0700 |
| commit | f7794460e8e9e0c514b0cb01dd010b531c21169c (patch) | |
| tree | 4bc195ab38f3e0e106b21b02d080be558ba80b33 /src/w32term.c | |
| parent | e6d6a99455183bca5074b7601ad11d424da6442e (diff) | |
| parent | 78f9af707f711121ba24d8dce88d6757683a4dfe (diff) | |
| download | emacs-f7794460e8e9e0c514b0cb01dd010b531c21169c.tar.gz emacs-f7794460e8e9e0c514b0cb01dd010b531c21169c.zip | |
Merge from origin/emacs-25
78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/w32term.c b/src/w32term.c index 8955ce26b4b..74ea6b543bd 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -6245,6 +6245,8 @@ x_set_window_size (struct frame *f, bool change_gravity, | |||
| 6245 | } | 6245 | } |
| 6246 | 6246 | ||
| 6247 | unblock_input (); | 6247 | unblock_input (); |
| 6248 | |||
| 6249 | do_pending_window_change (false); | ||
| 6248 | } | 6250 | } |
| 6249 | 6251 | ||
| 6250 | /* Mouse warping. */ | 6252 | /* Mouse warping. */ |