# HG changeset patch # User Christian Brabandt # Date 1533846607 -7200 # Node ID 77968a364ec4cb46e4343daf13789a8be47f6add # Parent cb175ab74dff4014f6c4b0cc44d7492885e40f63 patch 8.1.0264: backup tests fail when CWD is in /tmp commit https://github.com/vim/vim/commit/efe03738f69b1f63ea30226765db949539ee15f0 Author: Bram Moolenaar Date: Thu Aug 9 22:26:38 2018 +0200 patch 8.1.0264: backup tests fail when CWD is in /tmp Problem: Backup tests fail when CWD is in /tmp. Solution: Make 'backupskip' empty. (Christian Brabandt, closes https://github.com/vim/vim/issues/3301) diff --git a/src/testdir/test_backup.vim b/src/testdir/test_backup.vim --- a/src/testdir/test_backup.vim +++ b/src/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 @@ -34,11 +34,11 @@ func Test_backup2() 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 @@ -54,5 +54,5 @@ func Test_backup2_backupcopy() 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 264, +/**/ 263, /**/ 262,