Mercurial > vim
changeset 3620:4f1c511e71f8 v7.3.570
updated for version 7.3.570
Problem: ":vimgrep" does not obey 'wildignore'.
Solution: Apply 'wildignore' and 'suffixes' to ":vimgrep". (Ingo Karkat)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 29 Jun 2012 12:57:06 +0200 |
| parents | 08ea0523a078 |
| children | bf372f5a8cfb |
| files | src/ex_cmds2.c src/proto/ex_cmds2.pro src/quickfix.c src/spell.c src/version.c |
| diffstat | 5 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1850,22 +1850,28 @@ get_arglist(gap, str) #if defined(FEAT_QUICKFIX) || defined(FEAT_SYN_HL) || defined(PROTO) /* * Parse a list of arguments (file names), expand them and return in - * "fnames[fcountp]". + * "fnames[fcountp]". When "wig" is TRUE, removes files matching 'wildignore'. * Return FAIL or OK. */ int -get_arglist_exp(str, fcountp, fnamesp) +get_arglist_exp(str, fcountp, fnamesp, wig) char_u *str; int *fcountp; char_u ***fnamesp; + int wig; { garray_T ga; int i; if (get_arglist(&ga, str) == FAIL) return FAIL; - i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, - fcountp, fnamesp, EW_FILE|EW_NOTFOUND); + if (wig == TRUE) + i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, + fcountp, fnamesp, EW_FILE|EW_NOTFOUND); + else + i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, + fcountp, fnamesp, EW_FILE|EW_NOTFOUND); + ga_clear(&ga); return i; }
--- a/src/proto/ex_cmds2.pro +++ b/src/proto/ex_cmds2.pro @@ -42,7 +42,7 @@ int check_changed_any __ARGS((int hidden int check_fname __ARGS((void)); int buf_write_all __ARGS((buf_T *buf, int forceit)); int get_arglist __ARGS((garray_T *gap, char_u *str)); -int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp)); +int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp, int wig)); void set_arglist __ARGS((char_u *str)); void check_arg_idx __ARGS((win_T *win)); void ex_args __ARGS((exarg_T *eap));
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -3189,7 +3189,7 @@ ex_vimgrep(eap) ; /* parse the list of arguments */ - if (get_arglist_exp(p, &fcount, &fnames) == FAIL) + if (get_arglist_exp(p, &fcount, &fnames, TRUE) == FAIL) goto theend; if (fcount == 0) {
--- a/src/spell.c +++ b/src/spell.c @@ -8553,7 +8553,7 @@ ex_mkspell(eap) } /* Expand all the remaining arguments (e.g., $VIMRUNTIME). */ - if (get_arglist_exp(arg, &fcount, &fnames) == OK) + if (get_arglist_exp(arg, &fcount, &fnames, FALSE) == OK) { mkspell(fcount, fnames, ascii, eap->forceit, FALSE); FreeWild(fcount, fnames);