thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.2299: ConPTY in MS-Windows 1909 is still wrong

Browse Source 
Problem:    ConPTY in MS-Windows 1909 is still wrong.
Solution:   Use same solution as for 1903. (Nobuhiro Takasaki, closes #5217)
This commit is contained in:
Bram Moolenaar 2019-11-13 21:49:24 +01:00
parent 0743ef9f8a
commit 36e7a823c6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc2.c
View File

@ -4456,7 +4456,7 @@ build_argv_from_list(list_T *l, char ***argv, int *argc)
* 0: As usual. * 0: As usual.
* 1: Windows 10 version 1809 * 1: Windows 10 version 1809
* The bug causes unstable handling of ambiguous width character. * 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. * Use the wrong result because each result is different.
* 3: Windows 10 insider preview (current latest logic) * 3: Windows 10 insider preview (current latest logic)
*/ */

11
src/os_win32.c
View File

@ -4660,8 +4660,8 @@ mch_call_shell(
++cmdbase; ++cmdbase;
// Check the command does not begin with "start " // Check the command does not begin with "start "
if (cmdbase == NULL if (cmdbase == NULL || STRNICMP(cmdbase, "start", 5) != 0
|| STRNICMP(cmdbase, "start", 5) != 0 || !VIM_ISWHITE(cmdbase[5])) || !VIM_ISWHITE(cmdbase[5]))
{ {
// Use a terminal window to run the command in. // Use a terminal window to run the command in.
x = mch_call_shell_terminal(cmd, options); 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) #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. * Confirm until this version. Also the logic changes.
* insider preview. * insider preview.
@ -7308,6 +7313,8 @@ vtp_flag_init(void)
if (ver <= CONPTY_INSIDER_BUILD) if (ver <= CONPTY_INSIDER_BUILD)
conpty_type = 3; conpty_type = 3;
if (ver <= CONPTY_1909_BUILD)
conpty_type = 2;
if (ver <= CONPTY_1903_BUILD) if (ver <= CONPTY_1903_BUILD)
conpty_type = 2; conpty_type = 2;
if (ver < CONPTY_FIRST_SUPPORT_BUILD) if (ver < CONPTY_FIRST_SUPPORT_BUILD)

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2299,
/**/ /**/
2298, 2298,
/**/ /**/