aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_backup.vim
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2020-08-02 20:19:48 +0200
committerGitHub <noreply@github.com>2020-08-02 20:19:48 +0200
commit4ed5204bc9d5811cd45209476ac1b9e2c2b74146 (patch)
treeb3d811af95576072856a07f0dffcb86c76de6604 /src/nvim/testdir/test_backup.vim
parent480515e4426865c37a42a452432b3463f0ab40a7 (diff)
parentea515f8ca1fa63cfad516a956cd78ef371f91955 (diff)
downloadrneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.tar.gz
rneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.tar.bz2
rneovim-4ed5204bc9d5811cd45209476ac1b9e2c2b74146.zip
Merge pull request #12665 from janlazo/vim-8.2.1254
vim-patch:8.0.1774,8.1.{192,194,255,264,1202,2172,2340},8.2.{62,71,72,1004,1254,1259,1265,1267,1292,1295}
Diffstat (limited to 'src/nvim/testdir/test_backup.vim')
-rw-r--r--src/nvim/testdir/test_backup.vim16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/testdir/test_backup.vim b/src/nvim/testdir/test_backup.vim
index fa10430613..ce2bfe72bc 100644
--- a/src/nvim/testdir/test_backup.vim
+++ b/src/nvim/testdir/test_backup.vim
@@ -1,7 +1,7 @@
" Tests for the backup function
func Test_backup()
- set backup backupdir=.
+ set backup backupdir=. backupskip=
new
call setline(1, ['line1', 'line2'])
:f Xbackup.txt
@@ -12,13 +12,13 @@ func Test_backup()
let l = readfile('Xbackup.txt~')
call assert_equal(['line1', 'line2'], l)
bw!
- set backup&vim backupdir&vim
+ set backup&vim backupdir&vim backupskip&vim
call delete('Xbackup.txt')
call delete('Xbackup.txt~')
endfunc
func Test_backup2()
- set backup backupdir=.//
+ set backup backupdir=.// backupskip=
new
call setline(1, ['line1', 'line2', 'line3'])
:f Xbackup.txt
@@ -29,16 +29,16 @@ func Test_backup2()
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
let f=expand('%')
- call assert_match('src%nvim%testdir%Xbackup.txt\~', f)
+ call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
call delete('Xbackup.txt')
call delete(f)
- set backup&vim backupdir&vim
+ set backup&vim backupdir&vim backupskip&vim
endfunc
func Test_backup2_backupcopy()
- set backup backupdir=.// backupcopy=yes
+ set backup backupdir=.// backupcopy=yes backupskip=
new
call setline(1, ['line1', 'line2', 'line3'])
:f Xbackup.txt
@@ -49,10 +49,10 @@ func Test_backup2_backupcopy()
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
let f=expand('%')
- call assert_match('src%nvim%testdir%Xbackup.txt\~', f)
+ call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
call delete('Xbackup.txt')
call delete(f)
- set backup&vim backupdir&vim backupcopy&vim
+ set backup&vim backupdir&vim backupcopy&vim backupskip&vim
endfunc