From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 1 Jun 2020 12:07:49 +0000 (+0200)
Subject: patch 8.2.0870: MS-Windows: Control keys don't work in the GUI
X-Git-Tag: v8.2.0870
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad772a63ec3bc86fe9d53cba783812f53470a313;p=thirdparty%2Fvim.git

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 3df9921484..dc408bb88d 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 d211e8cd0a..e51e65021f 100644
--- 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,
 /**/