patch 8.1.2260: terminal test may fail on MS-Windows

Problem:    Terminal test may fail on MS-Windows.
Solution:   Catch the situation that "term dir" fails with a CreateProcess
            error.

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 10e107553f2aaad035adfe1094c371b837ca7d9b..43a93847a98329ad1ff0a26fad2ca741267dcb20 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2226,8 +2226,12 @@ func Test_terminal_shell_option()
     bwipe!
   elseif has('win32')
     " dir is a shell builtin command, should fail without a shell.
-    term dir /b runtest.vim
-    call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))})
+    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

diff --git a/src/version.c b/src/version.c
index 0a210b6ea4891e4927f0053f633215d559f910da..4fd069488af5b82f5b226ca69b1a2058d6722615 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2260,
 /**/
     2259,
 /**/