From: LemonBoy <thatlemon@gmail.com>
Date: Sun, 3 Apr 2022 10:58:31 +0000 (+0100)
Subject: patch 8.2.4671: 'wildignorecase' is sometimes not used for glob()
X-Git-Tag: v8.2.4671
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3157a476bfa8c3077d510cc8400093c0d115df5;p=vim

patch 8.2.4671: 'wildignorecase' is sometimes not used for glob()

Problem:    'wildignorecase' is sometimes not used for glob().
Solution:   Also use 'wildignorecase' when there are no wildcards.
            (closes #10066, closes #8350)
---

diff --git a/src/filepath.c b/src/filepath.c
index 851091e57..5bf31ea8e 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -3945,13 +3945,13 @@ gen_expand_wildcards(
 	    }
 
 	    /*
-	     * If there are wildcards: Expand file names and add each match to
-	     * the list.  If there is no match, and EW_NOTFOUND is given, add
-	     * the pattern.
-	     * If there are no wildcards: Add the file name if it exists or
-	     * when EW_NOTFOUND is given.
+	     * If there are wildcards or case-insensitive expansion is
+	     * required: Expand file names and add each match to the list.  If
+	     * there is no match, and EW_NOTFOUND is given, add the pattern.
+	     * Otherwise: Add the file name if it exists or when EW_NOTFOUND is
+	     * given.
 	     */
-	    if (mch_has_exp_wildcard(p))
+	    if (mch_has_exp_wildcard(p) || (flags & EW_ICASE))
 	    {
 #if defined(FEAT_SEARCHPATH)
 		if ((flags & EW_PATH)
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index fddf4aeb6..a19dd5271 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2821,6 +2821,8 @@ func Test_glob()
   " Sort output of glob() otherwise we end up with different
   " ordering depending on whether file system is case-sensitive.
   call assert_equal(['XGLOB2', 'Xglob1'], sort(glob('Xglob[12]', 0, 1)))
+  " wildignorecase shall be applied even when the pattern contains no wildcards.
+  call assert_equal('XGLOB2', glob('xglob2'))
   set wildignorecase&
 
   call delete('Xglob1')
diff --git a/src/version.c b/src/version.c
index 487a134d0..c6111fc92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4671,
 /**/
     4670,
 /**/