Skip to content

Commit

Permalink
patch 8.2.4671: 'wildignorecase' is sometimes not used for glob()
Browse files Browse the repository at this point in the history
Problem:    'wildignorecase' is sometimes not used for glob().
Solution:   Also use 'wildignorecase' when there are no wildcards.
            (closes #10066, closes #8350)
  • Loading branch information
LemonBoy authored and brammool committed Apr 3, 2022
1 parent 72bb47e commit a3157a4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/filepath.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions src/testdir/test_functions.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4671,
/**/
4670,
/**/
Expand Down

0 comments on commit a3157a4

Please sign in to comment.