From 36e7a823c66cfefb553c723e6792bcc6a1573b03 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 13 Nov 2019 21:49:24 +0100
Subject: [PATCH] patch 8.1.2299: ConPTY in MS-Windows 1909 is still wrong

Problem:    ConPTY in MS-Windows 1909 is still wrong.
Solution:   Use same solution as for 1903. (Nobuhiro Takasaki, closes #5217)
---
 src/misc2.c    |  2 +-
 src/os_win32.c | 11 +++++++++--
 src/version.c  |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/misc2.c b/src/misc2.c
index 67fa8b5eed..8903b0d06b 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4456,7 +4456,7 @@ build_argv_from_list(list_T *l, char ***argv, int *argc)
  * 0: As usual.
  * 1: Windows 10 version 1809
  *      The bug causes unstable handling of ambiguous width character.
- * 2: Windows 10 version 1903
+ * 2: Windows 10 version 1903 & 1909
  *      Use the wrong result because each result is different.
  * 3: Windows 10 insider preview (current latest logic)
  */
diff --git a/src/os_win32.c b/src/os_win32.c
index 13960d167e..265dd7e948 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4660,8 +4660,8 @@ mch_call_shell(
 		++cmdbase;
 
 	// Check the command does not begin with "start "
-	if (cmdbase == NULL
-		|| STRNICMP(cmdbase, "start", 5) != 0 || !VIM_ISWHITE(cmdbase[5]))
+	if (cmdbase == NULL || STRNICMP(cmdbase, "start", 5) != 0
+						   || !VIM_ISWHITE(cmdbase[5]))
 	{
 	    // Use a terminal window to run the command in.
 	    x = mch_call_shell_terminal(cmd, options);
@@ -7268,6 +7268,11 @@ mch_setenv(char *var, char *value, int x UNUSED)
  */
 #define CONPTY_1903_BUILD	    MAKE_VER(10, 0, 18362)
 
+/*
+ * version 1909 (November 2019 update).
+ */
+#define CONPTY_1909_BUILD	    MAKE_VER(10, 0, 18363)
+
 /*
  * Confirm until this version.  Also the logic changes.
  * insider preview.
@@ -7308,6 +7313,8 @@ vtp_flag_init(void)
 
     if (ver <= CONPTY_INSIDER_BUILD)
 	conpty_type = 3;
+    if (ver <= CONPTY_1909_BUILD)
+	conpty_type = 2;
     if (ver <= CONPTY_1903_BUILD)
 	conpty_type = 2;
     if (ver < CONPTY_FIRST_SUPPORT_BUILD)
diff --git a/src/version.c b/src/version.c
index d763e4c600..2221d64f51 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2299,
 /**/
     2298,
 /**/