patch 9.0.0895: file renamed twice in test, missing feature check

Problem:    File renamed twice in test; missing feature check.
Solution:   Remove a rename() call.  Add check for cryptv feature.
            (closes #11564)

diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index cb34c64dd2db9b6fb221811120acbcd71c0d4470..395eb06ff59f628644ca7fc6999102454efd5a26 100644 (file)
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -121,7 +121,6 @@ func Test_nocatch_process_still_running()
   call test_override("uptime", 0)
   sleep 1
 
-  call rename('Xswap', swname)
   call feedkeys('e', 'tL')
   redir => editOutput
   edit Xswaptest
@@ -322,6 +321,7 @@ endfunc
 
 " Test for :recover using an encrypted swap file
 func Test_recover_encrypted_swap_file()
+  CheckFeature cryptv
   CheckUnix
 
   " Recover an encrypted file from the swap file without the original file

diff --git a/src/version.c b/src/version.c
index f4e9ee19544383bacec62ed3ac696ed5543cca73..fdccde945453fd8c9d38c528a29c3959f18e3ae4 100644 (file)
--- 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 */
+/**/
+    895,
 /**/
     894,
 /**/