diff options
| -rw-r--r-- | src/testdir/runtest.vim | 7 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 2eabb1a9c..6c42616c5 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -364,6 +364,13 @@ func RunTheTest(test) call add(s:messages, message) let s:done += 1 + " May be editing some buffer, wipe it out. Then we may end up in another + " buffer, continue until we end up in an empty no-name buffer without a swap + " file. + while bufname() != '' || execute('swapname') !~ 'No swap file' + bwipe! + endwhile + " Check if the test has left any swap files behind. Delete them before " running tests again, they might interfere. let swapfiles = s:GetSwapFileList() diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 593e56819..2df70b4df 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -578,6 +578,8 @@ func Test_WinScrolled_long_wrapped() call term_sendkeys(buf, '$') call term_sendkeys(buf, ":echo g:scrolled\<CR>") call WaitForAssert({-> assert_match('^3 ', term_getline(buf, 6))}, 1000) + + call StopVimInTerminal(buf) endfunc func Test_WinClosed() @@ -3162,7 +3164,7 @@ func Test_autocmd_FileReadCmd() \ 'v:cmdarg = ++ff=mac', \ 'v:cmdarg = ++enc=utf-8'], getline(1, '$')) - close! + bwipe! augroup FileReadCmdTest au! augroup END diff --git a/src/version.c b/src/version.c index b2f1babba..b8b346071 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1010, +/**/ 1009, /**/ 1008, |