Mercurial > vim
changeset 22397:0a5770061295 v8.2.1747
patch 8.2.1747: result of expand() unexpectedly depends on 'completeslash'
Commit: https://github.com/vim/vim/commit/8f187fc6304222956f94a700758a490cc8c0af99
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 26 18:47:11 2020 +0200
patch 8.2.1747: result of expand() unexpectedly depends on 'completeslash'
Problem: Result of expand() unexpectedly depends on 'completeslash'.
Solution: Temporarily reset 'completeslash'. (Yasuhiro Matsumoto,
closes #7021)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 26 Sep 2020 19:00:03 +0200 |
| parents | 44cb9b1dc1ed |
| children | ca9544b14e58 |
| files | src/evalfunc.c src/testdir/test_ins_complete.vim src/version.c |
| diffstat | 3 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2436,6 +2436,12 @@ f_expand(typval_T *argvars, typval_T *re expand_T xpc; int error = FALSE; char_u *result; +#ifdef BACKSLASH_IN_FILENAME + char_u *p_csl_save = p_csl; + + // avoid using 'completeslash' here + p_csl = empty_option; +#endif rettv->v_type = VAR_STRING; if (argvars[1].v_type != VAR_UNKNOWN @@ -2488,6 +2494,9 @@ f_expand(typval_T *argvars, typval_T *re else rettv->vval.v_string = NULL; } +#ifdef BACKSLASH_IN_FILENAME + p_csl = p_csl_save; +#endif } /*
--- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -363,12 +363,12 @@ endfunc " Test for insert path completion with completeslash option func Test_ins_completeslash() CheckMSWindows - + call mkdir('Xdir') let orig_shellslash = &shellslash set cpt& new - + set noshellslash set completeslash= @@ -654,4 +654,17 @@ func Test_complete_cmdline() close! endfunc +func Test_issue_7021() + CheckMSWindows + + let orig_shellslash = &shellslash + set noshellslash + + set completeslash=slash + call assert_false(expand('~') =~ '/') + + let &shellslash = orig_shellslash + set completeslash= +endfunc + " vim: shiftwidth=2 sts=2 expandtab