Mercurial > vim
changeset 18611:6a7ebc2ee528 v8.1.2299
patch 8.1.2299: ConPTY in MS-Windows 1909 is still wrong
Commit: https://github.com/vim/vim/commit/36e7a823c66cfefb553c723e6792bcc6a1573b03
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 13 21:49:24 2019 +0100
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 https://github.com/vim/vim/issues/5217)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 13 Nov 2019 22:00:05 +0100 |
| parents | 3ef71254a154 |
| children | 29a5273d0270 |
| files | src/misc2.c src/os_win32.c src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc2.c +++ b/src/misc2.c @@ -4456,7 +4456,7 @@ build_argv_from_list(list_T *l, char *** * 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) */
--- 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); @@ -7269,6 +7269,11 @@ mch_setenv(char *var, char *value, int x #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)