diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-09 14:00:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-09 14:00:27 +0100 |
| commit | 056f700031602a2734b1ddf45f6bc2817e49b996 (patch) | |
| tree | 589011687dceb5f1b197eb43d1049710c11d1b37 | |
| parent | 644df41c44cbdfacdedbba55ef77a6c6031eccd8 (diff) | |
| download | vim-git-056f700031602a2734b1ddf45f6bc2817e49b996.tar.gz | |
patch 8.0.0438: the fnamemodify test may cause later tests to failv8.0.0438
Problem: The fnamemodify test changes 'shell' in a way later tests may not
be able to use system().
Solution: Save and restore 'shell'.
| -rw-r--r-- | src/testdir/test_fnamemodify.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim index 2267e18e3..1c2a80d0e 100644 --- a/src/testdir/test_fnamemodify.vim +++ b/src/testdir/test_fnamemodify.vim @@ -1,6 +1,8 @@ " Test filename modifiers. func Test_fnamemodify() + let save_home = $HOME + let save_shell = &shell let $HOME = fnamemodify('.', ':p:h:h') set shell=sh @@ -39,7 +41,9 @@ func Test_fnamemodify() call assert_equal("'abc\ndef'", fnamemodify("abc\ndef", ':S')) set shell=tcsh call assert_equal("'abc\\\ndef'", fnamemodify("abc\ndef", ':S')) - set shell& + + let $HOME = save_home + let &shell = save_shell endfunc func Test_expand() diff --git a/src/version.c b/src/version.c index 413c2c1de..811a3d6a9 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 438, +/**/ 437, /**/ 436, |