diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-02-20 12:07:22 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-02-20 12:07:22 -0800 |
| commit | 83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3 (patch) | |
| tree | 11d2812db4a9ee4e66976b3a5f1e5ecbe52b4955 /src/w32term.c | |
| parent | ae77728d14e58054bdaee3c6965979947c778208 (diff) | |
| parent | ff9c9620794e5fe5692cfd3badd207aac78921cb (diff) | |
| download | emacs-83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3.tar.gz | |
Merge from origin/emacs-26
ff9c962 ; * lisp/ldefs-boot.el: Update.
b4a251c * ; ChangeLog.3 update
d3104e3 * etc/AUTHORS: Update.
a19bfb7 Remove .art from the default list of ImageMagick extensions
6985caa Fix input after setting x-wait-for-event-timeout nil
715388a Fix two warnings in eshell.texi
d49cdd9 * lisp/minibuffer.el (completion-table-dynamic): Improve docs...
5dc4e51 * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fi...
76ef805 Fix a typo in ELisp manual
b5e66f4 Update citations of Internet RFCs
57ece2a Fix handling of manpage references divided by hyphenation
7ad0cd6 * doc/misc/eshell.texi: Fix some @ref's.
12b7940 Fix a typo in lispref/syntax.texi
# Conflicts:
# lisp/gnus/nnrss.el
# lisp/mail/ietf-drums.el
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/w32term.c b/src/w32term.c index 6fc86124199..bdd02d05400 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6733,7 +6733,10 @@ x_make_frame_visible (struct frame *f) } if (!FLOATP (Vx_wait_for_event_timeout)) + { + unblock_input (); return; + } /* Synchronize to ensure Emacs knows the frame is visible before we do anything else. We do this loop with input not blocked |