diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-07-31 22:18:22 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-07-31 22:18:22 +0200 |
commit | dff2adc8ddcb6c8f3390a82c321362f8d6756fb8 (patch) | |
tree | 36c728f6775f0070e537715eee8f9116860bd97b | |
parent | 5477506a9f01d40fad2e8f0555bc37adee30478f (diff) |
patch 8.1.1783: MS-Windows: compiler test may fail when using %:Sv8.1.1783
Problem: MS-Windows: compiler test may fail when using %:S.
Solution: Reset 'shellslash'.
-rw-r--r-- | src/testdir/test_compiler.vim | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim index 46c14d8bc3..f561e84a38 100644 --- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -10,6 +10,10 @@ func Test_compiler() unlet $LANG endif + " %:S does not work properly with 'shellslash' set + let save_shellslash = &shellslash + set noshellslash + e Xfoo.pl compiler perl call assert_equal('perl', b:current_compiler) @@ -27,6 +31,7 @@ func Test_compiler() call assert_match("\n 1 Xfoo.pl:3: Global symbol \"\$foo\" " \ . "requires explicit package name", a) + let &shellslash = save_shellslash call delete('Xfoo.pl') bw! endfunc diff --git a/src/version.c b/src/version.c index 03cccfb06a..b8734711de 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1783, +/**/ 1782, /**/ 1781, |