patch 8.0.1354: Shift-Insert doesn't always work in MS-Windows console

Problem:    Shift-Insert doesn't always work in MS-Windows console.
Solution:   Handle K_NUL differently. (Yasuhiro Matsumoto, closes #2381)

diff --git a/src/os_win32.c b/src/os_win32.c
index becbeeee276ae86797661aa5a34e545939cf9a92..c1c297a63dfe17ec9a7b5d1806997cd0b45c89d6 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1817,9 +1817,18 @@ mch_inchar(
                    typeahead[typeaheadlen] = c;
                if (ch2 != NUL)
                {
-                   typeahead[typeaheadlen + n] = 3;
-                   typeahead[typeaheadlen + n + 1] = (char_u)ch2;
-                   n += 2;
+                   if (c == K_NUL)
+                   {
+                       /* fAnsiKey */
+                       typeahead[typeaheadlen + n] = (char_u)ch2;
+                       n++;
+                   }
+                   else
+                   {
+                       typeahead[typeaheadlen + n] = 3;
+                       typeahead[typeaheadlen + n + 1] = (char_u)ch2;
+                       n += 2;
+                   }
                }
 
                if (conv)

diff --git a/src/version.c b/src/version.c
index f29d449ad72a6ae45eed5b78944eef65b4136768..4f9d0b190593474068a69178ddc429bc39b76ead 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1354,
 /**/
     1353,
 /**/