diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-12-02 21:44:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-12-02 21:44:40 +0100 |
| commit | 005c3c27ee586126d7a40c41911cf600b9bbe3d1 (patch) | |
| tree | ba845e1e187e4a42c2f9cf78e95c4c402390cef8 | |
| parent | bf9680e441f09a6b90ad3185154474442d363a55 (diff) | |
| download | vim-git-005c3c27ee586126d7a40c41911cf600b9bbe3d1.tar.gz | |
updated for version 7.3.075v7.3.075
Problem: Missing part of 'wildignorecase'
Solution: Also adjust expand()
| -rw-r--r-- | src/eval.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index a17d743e8..4d7afa043 100644 --- 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 index f400d1c66..489e59e39 100644 --- 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, |