# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1511889306 -3600
# Node ID 653ae4253f1dea72bfd7f9e78ba55549520120e9
# Parent  bd2443d8d5abc8ebe30d4a524a0c2db346b1f96a
patch 8.0.1354: Shift-Insert doesn't always work in MS-Windows console

commit https://github.com/vim/vim/commit/3660a10c73a6d716ae9fca21f7c5a3282ddc7c85
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Nov 28 18:07:59 2017 +0100

    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 https://github.com/vim/vim/issues/2381)

diff --git a/src/os_win32.c b/src/os_win32.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1354,
+/**/
     1353,
 /**/
     1352,