summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-08 11:02:32 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-08 11:02:32 +0200
commitf8f88f89e12df516c1fac5851b504238ebc1d2d4 (patch)
treecb7e756bb75ce994dbfbbe6109c8b10c9271fe14
parent980bab457ebb4df4b05d54b9d731520774f20d1d (diff)
patch 8.1.0255: backup test fails when using shadow directoryv8.1.0255
Problem: Backup test fails when using shadow directory. Solution: Remove check for "src".
-rw-r--r--src/testdir/test_backup.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_backup.vim b/src/testdir/test_backup.vim
index 3187b58878..0981efdcee 100644
--- a/src/testdir/test_backup.vim
+++ b/src/testdir/test_backup.vim
@@ -29,7 +29,7 @@ func Test_backup2()
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
let f=expand('%')
- call assert_match('src%testdir%Xbackup.txt\~', f)
+ call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
call delete('Xbackup.txt')
@@ -49,7 +49,7 @@ func Test_backup2_backupcopy()
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
let f=expand('%')
- call assert_match('src%testdir%Xbackup.txt\~', f)
+ call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
call delete('Xbackup.txt')
diff --git a/src/version.c b/src/version.c
index 099ea1fa28..76d47dd63e 100644
--- 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 */
/**/
+ 255,
+/**/
254,
/**/
253,