# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1637325902 -3600
# Node ID 9865f996a3c018a48b4148b10924f4d2a41a987b
# Parent  c3b0032c81170a6c6e1363af24d5c8557824ebaf
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)

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
--- 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: >
 
diff --git a/src/os_unix.c b/src/os_unix.c
--- 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)
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
--- 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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3623,
+/**/
     3622,
 /**/
     3621,