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 67fa8b5..8903b0d 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4456,7 +4456,7 @@
* 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 13960d1..265dd7e 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4660,8 +4660,8 @@
++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);
@@ -7269,6 +7269,11 @@
#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 @@
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 d763e4c..2221d64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2299,
+/**/
2298,
/**/
2297,