patch 8.2.0870: MS-Windows: Control keys don't work in the GUIv8.2.0870

Problem:    MS-Windows: Control keys don't work in the GUI.
Solution:   Don't set seenModifyOtherKeys for now. (Yasuhiro Matsumoto,
            closes #6175)

2 files changed, 7 insertions, 0 deletions

diff --git a/src/gui.c b/src/gui.c
index 3df992148..dc408bb88 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -803,8 +803,13 @@ gui_init(void)
 	if (!p_beval)
 	    gui_mch_disable_beval_area(balloonEval);
 #endif
+
+#ifndef FEAT_GUI_MSWIN
 	// In the GUI modifiers are prepended to keys.
+	// Don't do this for MS-Windows yet, it sends CTRL-K without the
+	// modifier.
 	seenModifyOtherKeys = TRUE;
+#endif
 
 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
 	if (!im_xim_isvalid_imactivate())
diff --git a/src/version.c b/src/version.c
index d211e8cd0..e51e65021 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    870,
+/**/
     869,
 /**/
     868,