From 056f700031602a2734b1ddf45f6bc2817e49b996 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 9 Mar 2017 14:00:27 +0100 Subject: patch 8.0.0438: the fnamemodify test may cause later tests to fail Problem: The fnamemodify test changes 'shell' in a way later tests may not be able to use system(). Solution: Save and restore 'shell'. --- src/testdir/test_fnamemodify.vim | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim index 2267e18e3b..1c2a80d0ee 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 413c2c1de5..811a3d6a98 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 438, /**/ 437, /**/ -- cgit v1.2.3