aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-06-01 11:35:41 +0200
committerGitHub <noreply@github.com>2019-06-01 11:35:41 +0200
commitef33500e178e66880795eeaec21d5f6a530c52d5 (patch)
tree7488cd22ad533f1cf2949ad6d6cdddcae4089998 /src/nvim/testdir
parentc6cd6081b8c449fa9890c18b5e2151e3af9bd45d (diff)
parentafcfb7bd58a6ca98524f60f934852c31a288a9a5 (diff)
downloadrneovim-ef33500e178e66880795eeaec21d5f6a530c52d5.tar.gz
rneovim-ef33500e178e66880795eeaec21d5f6a530c52d5.tar.bz2
rneovim-ef33500e178e66880795eeaec21d5f6a530c52d5.zip
Merge #10099 from janlazo/vim-8.1.1000
vim-patch:8.1.{1000,1436}
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/test_writefile.vim7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_writefile.vim b/src/nvim/testdir/test_writefile.vim
index b4585a72ef..aeee6ad88b 100644
--- a/src/nvim/testdir/test_writefile.vim
+++ b/src/nvim/testdir/test_writefile.vim
@@ -38,7 +38,7 @@ func Test_writefile_fails_conversion()
endif
" Without a backup file the write won't happen if there is a conversion
" error.
- set nobackup nowritebackup
+ set nobackup nowritebackup backupdir=. backupskip=
new
let contents = ["line one", "line two"]
call writefile(contents, 'Xfile')
@@ -49,7 +49,7 @@ func Test_writefile_fails_conversion()
call delete('Xfile')
bwipe!
- set backup& writebackup&
+ set backup& writebackup& backupdir&vim backupskip&vim
endfunc
func Test_writefile_fails_conversion2()
@@ -58,7 +58,7 @@ func Test_writefile_fails_conversion2()
endif
" With a backup file the write happens even if there is a conversion error,
" but then the backup file must remain
- set nobackup writebackup
+ set nobackup writebackup backupdir=. backupskip=
let contents = ["line one", "line two"]
call writefile(contents, 'Xfile_conversion_err')
edit Xfile_conversion_err
@@ -71,6 +71,7 @@ func Test_writefile_fails_conversion2()
call delete('Xfile_conversion_err')
call delete('Xfile_conversion_err~')
bwipe!
+ set backup& writebackup& backupdir&vim backupskip&vim
endfunc
func SetFlag(timer)