summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-30 13:51:37 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-30 13:51:37 +0200
commit5449f7c6fc574fed1020d70878becbbfca5a5a41 (patch)
tree760e9e456a737719e37d5185b2091189ab31c994
parentd0b6c6c54e0f3c2984e1d9b316a587ef14cfd53a (diff)
downloadvim-git-5449f7c6fc574fed1020d70878becbbfca5a5a41.tar.gz
patch 8.0.0811: MS-Windows: test_expand_dllpath failsv8.0.0811
Problem: MS-Windows: test_expand_dllpath fails. Solution: Change backslashes to forward slashes
-rw-r--r--src/testdir/test_expand_dllpath.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_expand_dllpath.vim b/src/testdir/test_expand_dllpath.vim
index b3e099a45..154209567 100644
--- a/src/testdir/test_expand_dllpath.vim
+++ b/src/testdir/test_expand_dllpath.vim
@@ -6,7 +6,8 @@ func s:test_expand_dllpath(optname)
execute 'call assert_equal("' . $TEST_EXPAND_DLLPATH . '", &' . a:optname . ')'
execute 'set ' . a:optname . '=~' . $TEST_EXPAND_DLLPATH
- execute 'call assert_equal("' . $HOME . $TEST_EXPAND_DLLPATH . '", &' . a:optname . ')'
+ let home = substitute($HOME, '\\', '/', 'g')
+ execute 'call assert_equal("' . home . $TEST_EXPAND_DLLPATH . '", &' . a:optname . ')'
finally
execute 'let &' . a:optname . ' = dllpath_save'
let $TEST_EXPAND_DLLPATH = ''
diff --git a/src/version.c b/src/version.c
index fa67f7f57..90d9273eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 811,
+/**/
810,
/**/
809,