summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/runtest.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index cc45393da..cd3683906 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -93,7 +93,12 @@ set encoding=utf-8
" REDIR_TEST_TO_NULL has a very permissive SwapExists autocommand which is for
" the test_name.vim file itself. Replace it here with a more restrictive one,
" so we still catch mistakes.
-let s:test_script_fname = expand('%')
+if has("win32")
+ " replace any '/' directory separators by '\\'
+ let s:test_script_fname = substitute(expand('%'), '/', '\\', 'g')
+else
+ let s:test_script_fname = expand('%')
+endif
au! SwapExists * call HandleSwapExists()
func HandleSwapExists()
if exists('g:ignoreSwapExists')
diff --git a/src/version.c b/src/version.c
index 9c0f845cb..2dd061eda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3579,
+/**/
3578,
/**/
3577,