diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-31 20:42:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-31 20:42:09 +0200 |
| commit | c28cb5b16df76353a5995fda3b9341612b8630c1 (patch) | |
| tree | cdd9b301eecbfe1c591735864e7251cfdadb6bc6 | |
| parent | 5d508dd39e810d446f29dfd4f4e745b802875001 (diff) | |
patch 8.1.1436: writefile test fails when run under /tmpv8.1.1436
Problem: Writefile test fails when run under /tmp.
Solution: Adjust 'backupskip. (Kenta Sato, closes #4462)
| -rw-r--r-- | src/testdir/test_writefile.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim index a06333d806..4b0a6d6c73 100644 --- a/src/testdir/test_writefile.vim +++ b/src/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) diff --git a/src/version.c b/src/version.c index fdb0844ddd..352969fd88 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1436, +/**/ 1435, /**/ 1434, |