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)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index b2ee9ca64132036d1d5f0e7cb1248160329921e2..0679ed222bcbd0304c0640c0641f614af91ce7b2 100644 (file)
--- 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 cdf05e113ea36a0555208cf3a180747fa2fa0189..552bb6bc13218ef8854da79d4c72a0da38137771 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1694,
 /**/
     1693,
 /**/