diff options
-rw-r--r-- | src/misc1.c | 5 | ||||
-rw-r--r-- | src/testdir/test_expand.vim | 13 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/misc1.c b/src/misc1.c index bf70e38478..3085fc77fb 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -1404,9 +1404,6 @@ expand_env_esc( int mustfree; // var was allocated, need to free it later int at_start = TRUE; // at start of a name int startstr_len = 0; -#if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) - char_u *save_dst = dst; -#endif if (startstr != NULL) startstr_len = (int)STRLEN(startstr); @@ -1631,7 +1628,7 @@ expand_env_esc( // with it, skip a character if (after_pathsep(dst, dst + c) #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) - && (dst == save_dst || dst[-1] != ':') + && dst[c - 1] != ':' #endif && vim_ispathsep(*tail)) ++tail; diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim index d7c393a04e..bebe13868f 100644 --- a/src/testdir/test_expand.vim +++ b/src/testdir/test_expand.vim @@ -51,6 +51,19 @@ func Test_expand_tilde_filename() bwipe! endfunc +func Test_expand_env_pathsep() + let $FOO = './foo' + call assert_equal('./foo/bar', expand('$FOO/bar')) + let $FOO = './foo/' + call assert_equal('./foo/bar', expand('$FOO/bar')) + let $FOO = 'C:' + call assert_equal('C:/bar', expand('$FOO/bar')) + let $FOO = 'C:/' + call assert_equal('C:/bar', expand('$FOO/bar')) + + unlet $FOO +endfunc + func Test_expandcmd() let $FOO = 'Test' call assert_equal('e x/Test/y', expandcmd('e x/$FOO/y')) diff --git a/src/version.c b/src/version.c index 507c4591a3..8f28596f05 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 161, +/**/ 160, /**/ 159, |