To: vim_dev@googlegroups.com Subject: Patch 8.1.2299 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2299 Problem: ConPTY in MS-Windows 1909 is still wrong. Solution: Use same solution as for 1903. (Nobuhiro Takasaki, closes #5217) Files: src/misc2.c, src/os_win32.c *** ../vim-8.1.2298/src/misc2.c 2019-10-13 16:43:35.956359658 +0200 --- src/misc2.c 2019-11-13 21:48:16.304806695 +0100 *************** *** 4456,4462 **** * 0: As usual. * 1: Windows 10 version 1809 * The bug causes unstable handling of ambiguous width character. ! * 2: Windows 10 version 1903 * Use the wrong result because each result is different. * 3: Windows 10 insider preview (current latest logic) */ --- 4456,4462 ---- * 0: As usual. * 1: Windows 10 version 1809 * The bug causes unstable handling of ambiguous width character. ! * 2: Windows 10 version 1903 & 1909 * Use the wrong result because each result is different. * 3: Windows 10 insider preview (current latest logic) */ *** ../vim-8.1.2298/src/os_win32.c 2019-10-17 22:58:59.070496999 +0200 --- src/os_win32.c 2019-11-13 21:48:16.304806695 +0100 *************** *** 4660,4667 **** ++cmdbase; // Check the command does not begin with "start " ! 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); --- 4660,4667 ---- ++cmdbase; // Check the command does not begin with "start " ! 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,7274 **** --- 7269,7279 ---- #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,7313 **** --- 7313,7320 ---- 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) *** ../vim-8.1.2298/src/version.c 2019-11-13 16:37:23.239373194 +0100 --- src/version.c 2019-11-13 21:47:59.592935527 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2299, /**/ -- Ed's Radiator Shop: The Best Place in Town to Take a Leak. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///