summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_autocmd.vim5
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index d0b5b5a4d..e9a59c29a 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2108,15 +2108,12 @@ function Test_dirchanged_global()
exe 'lcd ' .. fnameescape(s:dir_bar)
call assert_equal(expected, s:li)
- let save_shellslash = &shellslash
- set shellslash
exe 'cd ' .. s:dir_foo
exe 'cd ' .. s:dir_bar
autocmd! test_dirchanged DirChanged global let g:result = expand("<afile>")
cd -
- call assert_equal(s:dir_foo, g:result)
+ call assert_equal(s:dir_foo, substitute(g:result, '\\', '/', 'g'))
- let &shellslash = save_shellslash
call s:After_test_dirchanged()
endfunc
diff --git a/src/version.c b/src/version.c
index 6479ffa56..745f85c10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5083,
+/**/
5082,
/**/
5081,