[vim] 06/139: patch 7.4.1694 Problem: Win32 gvim doesn't work with "dvorakj" input method. Solution: Wait for QS_ALLINPUT instead of QS_ALLEVENTS. (Yukihiro Nakadaira)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit f28d87146544e3b5d70aaa6a2513019f6de043ad
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 2 15:59:40 2016 +0200

    patch 7.4.1694
    Problem:    Win32 gvim doesn't work with "dvorakj" input method.
    Solution:   Wait for QS_ALLINPUT instead of QS_ALLEVENTS. (Yukihiro Nakadaira)
---
 src/gui_w32.c | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index b2ee9ca..0679ed2 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 cdf05e1..552bb6b 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git