From 3660a10c73a6d716ae9fca21f7c5a3282ddc7c85 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 28 Nov 2017 18:07:59 +0100
Subject: [PATCH] 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)
---
 src/os_win32.c | 15 ++++++++++++---
 src/version.c  |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index becbeeee27..c1c297a63d 100644
--- 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 f29d449ad7..4f9d0b1905 100644
--- 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,
 /**/