From 23526d2539e8679ea8df14e3a018101dedc3f391 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 5 Dec 2022 15:50:41 +0000 Subject: patch 9.0.1010: stray warnings for existing swap files Problem: Stray warnings for existing swap files. Solution: Wipe out the buffer until it has no name and no swap file. --- src/testdir/runtest.vim | 7 +++++++ src/testdir/test_autocmd.vim | 4 +++- src/version.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 2eabb1a9cb..6c42616c5f 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 593e56819c..2df70b4df7 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\") 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 b2f1babba8..b8b346071a 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1010, /**/ 1009, /**/ -- cgit v1.2.3