updated for version 7.3.570
Problem: ":vimgrep" does not obey 'wildignore'.
Solution: Apply 'wildignore' and 'suffixes' to ":vimgrep". (Ingo Karkat)
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 5bc8242..d3bf04f 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1850,22 +1850,28 @@
#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;
}
diff --git a/src/proto/ex_cmds2.pro b/src/proto/ex_cmds2.pro
index dc3bb79..e4406d1 100644
--- a/src/proto/ex_cmds2.pro
+++ b/src/proto/ex_cmds2.pro
@@ -42,7 +42,7 @@
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));
diff --git a/src/quickfix.c b/src/quickfix.c
index bbcebe4..a1c4fe5 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3189,7 +3189,7 @@
;
/* 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)
{
diff --git a/src/spell.c b/src/spell.c
index f0f258a..ea47b1b 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -8553,7 +8553,7 @@
}
/* 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);
diff --git a/src/version.c b/src/version.c
index 95e5766..e60a4be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 570,
+/**/
569,
/**/
568,
