summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-05-18 16:23:43 +0200
committerBram Moolenaar <Bram@vim.org>2017-05-18 16:23:43 +0200
commit2a0b06def49198aef45ef173f524a638a700f9c9 (patch)
tree5bff9d8a1d50902a44a169ed3c4b38eee881a952
parent79a213d6a4e909703524a7f1ad985c7bd40650a6 (diff)
downloadvim-git-2a0b06def49198aef45ef173f524a638a700f9c9.tar.gz
patch 8.0.0600: test_recover fails on some systemsv8.0.0600
Problem: test_recover fails on some systems. Solution: Explicitly check if "/" is writable. (Ken Takata)
-rw-r--r--src/testdir/test_recover.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 33cd54bc5..2e34985fe 100644
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -7,7 +7,7 @@ func Test_recover_root_dir()
call assert_fails('recover', 'E305:')
close!
- if has('win32')
+ if has('win32') || filewritable('/') == 2
" can write in / directory on MS-Windows
set dir=/notexist/
endif
diff --git a/src/version.c b/src/version.c
index a572ae30b..7262a3d41 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 600,
+/**/
599,
/**/
598,