patch 8.2.0870: MS-Windows: Control keys don't work in the GUI

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

diff --git a/src/gui.c b/src/gui.c
index 3df99214847060abc8cfeca70e57492b9804ab87..dc408bb88d8dc69c14091841d37d5e100fa725a8 100644 (file)
--- 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 d211e8cd0a4840db439d7d7f8788528b6b9fdd1d..e51e65021f17ca2576a6ff5d134187df9dcddfa7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    870,
 /**/
     869,
 /**/