mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
committed by
Bram Moolenaar
parent
64be6aa3a5
commit
8b8d829faf
@@ -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: >
|
||||
|
||||
|
@@ -6691,10 +6691,17 @@ mch_expand_wildcards(
|
||||
}
|
||||
else
|
||||
{
|
||||
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)
|
||||
STRCPY(command, "set nonomatch; ");
|
||||
STRCAT(command, "set nonomatch; ");
|
||||
else
|
||||
STRCPY(command, "unset nonomatch; ");
|
||||
STRCAT(command, "unset nonomatch; ");
|
||||
}
|
||||
if (shell_style == STYLE_GLOB)
|
||||
STRCAT(command, "glob >");
|
||||
else if (shell_style == STYLE_PRINT)
|
||||
|
@@ -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
|
||||
|
@@ -757,6 +757,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3623,
|
||||
/**/
|
||||
3622,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user