summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-11-17 15:23:52 +0000
committerBram Moolenaar <Bram@vim.org>2022-11-17 15:23:52 +0000
commit780154bf7a07813e474105837c2b5998009d9c71 (patch)
tree218db9f4591b9307ff4181f1147f6cb71c10477f
parentee28c707e474682151554499874fc7bfb53360cb (diff)
patch 9.0.0895: file renamed twice in test, missing feature checkv9.0.0895
Problem: File renamed twice in test; missing feature check. Solution: Remove a rename() call. Add check for cryptv feature. (closes #11564)
-rw-r--r--src/testdir/test_recover.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index cb34c64dd2..395eb06ff5 100644
--- 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 f4e9ee1954..fdccde9454 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 */
/**/
+ 895,
+/**/
894,
/**/
893,