diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_terminal3.vim | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index 76e8a10543..3343dafd86 100644 --- a/src/testdir/test_terminal3.vim +++ b/src/testdir/test_terminal3.vim @@ -43,15 +43,18 @@ func Test_terminal_shell_option() 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 /b runtest.vim - call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) + term dir.com /b runtest.vim + call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) catch /CreateProcess/ " ignore endtry bwipe! - term ++shell dir /b runtest.vim + " 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 diff --git a/src/version.c b/src/version.c index 93da0a8ab7..26bd7ac651 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1312, +/**/ 1311, /**/ 1310, |