summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-09-14 22:58:23 +0200
committerBram Moolenaar <Bram@vim.org>2021-09-14 22:58:23 +0200
commitf2a8bafa4b815e5b4e50a25c2b3a8a24fbe8aa11 (patch)
tree2e192ed211f24a39f46bc4d38735b5a1182d9664
parent78eb9cce911dcd662182443e0920649ec1596d41 (diff)
patch 8.2.3440: recover test fails if there is an old swap filev8.2.3440
Problem: Recover test fails if there is an old swap file. Solution: Delete old swap files.
-rw-r--r--src/testdir/test_recover.vim6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 6ef4376def..9d2588313e 100644
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -170,6 +170,12 @@ func Test_recover_empty_swap_file()
call assert_match('Unable to read block 0 from .Xfile1.swp', msg)
call assert_equal('Xfile1', @%)
bw!
+
+ " make sure there are no old swap files laying around
+ for f in glob('.sw?', 0, 1)
+ call delete(f)
+ endfor
+
" :recover from an empty buffer
call assert_fails('recover', 'E305:')
call delete('.Xfile1.swp')
diff --git a/src/version.c b/src/version.c
index 47afcedb05..0598475082 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3440,
+/**/
3439,
/**/
3438,