summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-02 15:59:40 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-02 15:59:40 +0200
commitf28d87146544e3b5d70aaa6a2513019f6de043ad (patch)
tree71540de2a58e46fe030fda097e4637faab604e56
parent8e77bad3c18245f05a3db3acc566856d30667db8 (diff)
downloadvim-git-7.4.1694.tar.gz
patch 7.4.1694v7.4.1694
Problem: Win32 gvim doesn't work with "dvorakj" input method. Solution: Wait for QS_ALLINPUT instead of QS_ALLEVENTS. (Yukihiro Nakadaira)
-rw-r--r--src/gui_w32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index b2ee9ca64..0679ed222 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2218,7 +2218,7 @@ gui_mch_wait_for_chars(int wtime)
parse_queued_messages();
if (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)
- || MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLEVENTS)
+ || MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT)
!= WAIT_TIMEOUT)
break;
}
diff --git a/src/version.c b/src/version.c
index cdf05e113..552bb6bc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1694,
+/**/
1693,
/**/
1692,