To: vim_dev@googlegroups.com Subject: Patch 8.2.1312 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1312 Problem: MS-Windows: terminal test may fail if dir.exe exists. Solution: Use dir.com. (Ken Takata, closes #6557) Files: src/testdir/test_terminal3.vim *** ../vim-8.2.1311/src/testdir/test_terminal3.vim 2020-07-21 21:48:55.259727439 +0200 --- src/testdir/test_terminal3.vim 2020-07-28 21:38:19.164638594 +0200 *************** *** 43,57 **** bwipe! elseif has('win32') " dir is a shell builtin command, should fail without a shell. try ! term dir /b runtest.vim ! call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) catch /CreateProcess/ " ignore endtry bwipe! ! term ++shell dir /b runtest.vim call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) bwipe! endif --- 43,60 ---- bwipe! elseif has('win32') " dir is a shell builtin command, should fail without a shell. + " However, if dir.exe (which might be provided by Cygwin/MSYS2) exists in + " the %PATH%, "term dir" succeeds unintentionally. Use dir.com instead. try ! term dir.com /b runtest.vim ! call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) catch /CreateProcess/ " ignore endtry bwipe! ! " This should execute the dir builtin command even with ".com". ! term ++shell dir.com /b runtest.vim call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))}) bwipe! endif *** ../vim-8.2.1311/src/version.c 2020-07-28 21:15:04.084366193 +0200 --- src/version.c 2020-07-28 21:39:17.752443957 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1312, /**/ -- % cat /usr/include/real_life.h void life(void); /// 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 ///