# HG changeset patch # User Bram Moolenaar # Date 1291322680 -3600 # Node ID d94c322508140c4cc0d36364d994f475aa84f8d0 # Parent 2b475ed86e6491b20046d5c34fec8ea86988dade updated for version 7.3.075 Problem: Missing part of 'wildignorecase' Solution: Also adjust expand() diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -9876,7 +9876,7 @@ f_expand(argvars, rettv) char_u *s; int len; char_u *errormsg; - int flags = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND; + int options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND; expand_T xpc; int error = FALSE; @@ -9894,12 +9894,14 @@ f_expand(argvars, rettv) * for 'wildignore' and don't put matches for 'suffixes' at the end. */ if (argvars[1].v_type != VAR_UNKNOWN && get_tv_number_chk(&argvars[1], &error)) - flags |= WILD_KEEP_ALL; + options |= WILD_KEEP_ALL; if (!error) { ExpandInit(&xpc); xpc.xp_context = EXPAND_FILES; - rettv->vval.v_string = ExpandOne(&xpc, s, NULL, flags, WILD_ALL); + if (p_wic) + options += WILD_ICASE; + rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL); } else rettv->vval.v_string = NULL; @@ -11672,7 +11674,7 @@ f_glob(argvars, rettv) typval_T *argvars; typval_T *rettv; { - int flags = WILD_SILENT|WILD_USE_NL; + int options = WILD_SILENT|WILD_USE_NL; expand_T xpc; int error = FALSE; @@ -11680,14 +11682,16 @@ f_glob(argvars, rettv) * for 'wildignore' and don't put matches for 'suffixes' at the end. */ if (argvars[1].v_type != VAR_UNKNOWN && get_tv_number_chk(&argvars[1], &error)) - flags |= WILD_KEEP_ALL; + options |= WILD_KEEP_ALL; rettv->v_type = VAR_STRING; if (!error) { ExpandInit(&xpc); xpc.xp_context = EXPAND_FILES; + if (p_wic) + options += WILD_ICASE; rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]), - NULL, flags, WILD_ALL); + NULL, options, WILD_ALL); } else rettv->vval.v_string = NULL; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 75, +/**/ 74, /**/ 73,