diff options
| -rw-r--r-- | src/testdir/test_terminal.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 067fa0f09..fcc11565c 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -808,6 +808,13 @@ func Test_terminal_redir_file() endif let g:job = term_getjob(buf) call WaitForAssert({-> assert_equal("dead", job_status(g:job))}) + + if has('win32') + " On Windows we cannot delete a file being used by a process. When + " job_status() returns "dead", the process remains for a short time. + " Just wait for a moment. + sleep 50m + endif call delete('Xfile') bwipe diff --git a/src/version.c b/src/version.c index 36951df40..ed8f6c468 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 */ /**/ + 1273, +/**/ 1272, /**/ 1271, |