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)

diff --git a/src/misc2.c b/src/misc2.c
index 67fa8b5eedfbf510e2f9be2f63457146dbf3ad12..8903b0d06b5c77d12869d84758408c66b78a2964 100644 (file)
--- 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 13960d167e4da40d32e5d492cf04d7173a45a6c8..265dd7e94860f0f5dce7050303e19cc14f91a649 100644 (file)
--- 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 d763e4c60011aa8532c18621db4705bd80914250..2221d64f51011e95ab011eba853c6d9f19d61299 100644 (file)
--- 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,
 /**/