Mercurial > vim
changeset 26183:9865f996a3c0 v8.2.3623
patch 8.2.3623: "$*" is expanded to "nonomatch"
Commit: https://github.com/vim/vim/commit/8b8d829faf04fe3706c04f7f7000054acd3254e7
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Nov 19 12:37:36 2021 +0000
patch 8.2.3623: "$*" is expanded to "nonomatch"
Problem: "$*" is expanded to "nonomatch".
Solution: Only add "set nonomatch" when using a csh-like shell. (Christian
Brabandt, closes #9159, closes #9153)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 19 Nov 2021 13:45:02 +0100 |
parents | c3b0032c8117 |
children | 9f38d23faea0 |
files | runtime/doc/map.txt src/os_unix.c src/testdir/test_expand.vim src/version.c |
diffstat | 4 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1009,9 +1009,6 @@ or `unnamedplus`. The `mode()` function will return the state as it will be after applying the operator. -The `mode()` function will return the state as it will be after applying the -operator. - Here is an example for using a lambda function to create a normal-mode operator to add quotes around text in the current line: >
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -6691,10 +6691,17 @@ mch_expand_wildcards( } else { - if (flags & EW_NOTFOUND) - STRCPY(command, "set nonomatch; "); - else - STRCPY(command, "unset nonomatch; "); + STRCPY(command, ""); + if (shell_style == STYLE_GLOB) + { + // Assume the nonomatch option is valid only for csh like shells, + // otherwise, this may set the positional parameters for the shell, + // e.g. "$*". + if (flags & EW_NOTFOUND) + STRCAT(command, "set nonomatch; "); + else + STRCAT(command, "unset nonomatch; "); + } if (shell_style == STYLE_GLOB) STRCAT(command, "glob >"); else if (shell_style == STYLE_PRINT)
--- a/src/testdir/test_expand.vim +++ b/src/testdir/test_expand.vim @@ -1,6 +1,7 @@ " Test for expanding file names source shared.vim +source check.vim func Test_with_directories() call mkdir('Xdir1') @@ -135,4 +136,9 @@ func Test_expand_filename_multicmd() %bwipe! endfunc +func Test_expandcmd_shell_nonomatch() + CheckNotMSWindows + call assert_equal('$*', expandcmd('$*')) +endfunc + " vim: shiftwidth=2 sts=2 expandtab