summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-28 19:29:04 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-28 19:29:04 +0200
commit37ac4a531ce58daa201e3e045ef553734eaa432a (patch)
tree1fae04806d2ab3ccace1be80c0182cd983e75834
parent66f0e6c6e201c75c24d4aa8fac46e926f7ac9054 (diff)
downloadvim-git-37ac4a531ce58daa201e3e045ef553734eaa432a.tar.gz
patch 8.1.2098: mksession test fails on MS-Windowsv8.1.2098
Problem: mksession test fails on MS-Windows. Solution: Skip testing with backslashes on MS-Windows.
-rw-r--r--src/testdir/test_mksession.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 168ced473..7af5652c2 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -565,6 +565,9 @@ endfunc
" Test for changing backslash to forward slash in filenames
func Test_mksession_slash()
+ if exists('+shellslash')
+ throw 'Skipped: cannot use backslash in file name'
+ endif
enew
%bwipe!
e a\\b\\c
diff --git a/src/version.c b/src/version.c
index 736a632ff..20a028515 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2098,
+/**/
2097,
/**/
2096,