Mercurial > vim

comparison src/os_win32.c @ 18611:6a7ebc2ee528 v8.1.2299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9f51d0cef8da
children 652ac5edf8d0
comparison
equal deleted inserted replaced
18610:3ef71254a154 18611:6a7ebc2ee528
4658 // Skip a leading quote and (. 4658 // Skip a leading quote and (.
4659 while (*cmdbase == '"' || *cmdbase == '(') 4659 while (*cmdbase == '"' || *cmdbase == '(')
4660 ++cmdbase; 4660 ++cmdbase;
4661 4661
4662 // Check the command does not begin with "start " 4662 // Check the command does not begin with "start "
4663 if (cmdbase == NULL 4663 if (cmdbase == NULL || STRNICMP(cmdbase, "start", 5) != 0
4664 || STRNICMP(cmdbase, "start", 5) != 0 || !VIM_ISWHITE(cmdbase[5])) 4664 || !VIM_ISWHITE(cmdbase[5]))
4665 { 4665 {
4666 // Use a terminal window to run the command in. 4666 // Use a terminal window to run the command in.
4667 x = mch_call_shell_terminal(cmd, options); 4667 x = mch_call_shell_terminal(cmd, options);
4668 # ifdef FEAT_TITLE 4668 # ifdef FEAT_TITLE
4669 resettitle(); 4669 resettitle();
7267 * version 1903 (May 2019 update). 7267 * version 1903 (May 2019 update).
7268 */ 7268 */
7269 #define CONPTY_1903_BUILD MAKE_VER(10, 0, 18362) 7269 #define CONPTY_1903_BUILD MAKE_VER(10, 0, 18362)
7270 7270
7271 /* 7271 /*
7272 * version 1909 (November 2019 update).
7273 */
7274 #define CONPTY_1909_BUILD MAKE_VER(10, 0, 18363)
7275
7276 /*
7272 * Confirm until this version. Also the logic changes. 7277 * Confirm until this version. Also the logic changes.
7273 * insider preview. 7278 * insider preview.
7274 */ 7279 */
7275 #define CONPTY_INSIDER_BUILD MAKE_VER(10, 0, 18995) 7280 #define CONPTY_INSIDER_BUILD MAKE_VER(10, 0, 18995)
7276 7281
7306 if (ver >= CONPTY_STABLE_BUILD) 7311 if (ver >= CONPTY_STABLE_BUILD)
7307 conpty_stable = 1; 7312 conpty_stable = 1;
7308 7313
7309 if (ver <= CONPTY_INSIDER_BUILD) 7314 if (ver <= CONPTY_INSIDER_BUILD)
7310 conpty_type = 3; 7315 conpty_type = 3;
7316 if (ver <= CONPTY_1909_BUILD)
7317 conpty_type = 2;
7311 if (ver <= CONPTY_1903_BUILD) 7318 if (ver <= CONPTY_1903_BUILD)
7312 conpty_type = 2; 7319 conpty_type = 2;
7313 if (ver < CONPTY_FIRST_SUPPORT_BUILD) 7320 if (ver < CONPTY_FIRST_SUPPORT_BUILD)
7314 conpty_type = 1; 7321 conpty_type = 1;
7315 } 7322 }