Skip to content

Commit 20586cb

Browse files
committed
patch 8.0.1591: MS-Windows: when reparsing the arguments 'wildignore' matters
Problem: MS-Windows: when reparsing the arguments 'wildignore' matters. Solution: Save and reset 'wildignore'. (Yasuhiro Matsumoto, closes #2702)
1 parent 1a84024 commit 20586cb

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/os_win32.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7397,10 +7397,15 @@ fix_arg_enc(void)
73977397
/* Now expand wildcards in the arguments. */
73987398
/* Temporarily add '(' and ')' to 'isfname'. These are valid
73997399
* filename characters but are excluded from 'isfname' to make
7400-
* "gf" work on a file name in parenthesis (e.g.: see vim.h). */
7400+
* "gf" work on a file name in parenthesis (e.g.: see vim.h).
7401+
* Also, unset wildignore to not be influenced by this option.
7402+
* The arguments specified in command-line should be kept even if
7403+
* encoding options were changed. */
74017404
do_cmdline_cmd((char_u *)":let SaVe_ISF = &isf|set isf+=(,)");
7405+
do_cmdline_cmd((char_u *)":let SaVe_WIG = &wig|set wig=");
74027406
alist_expand(fnum_list, used_alist_count);
74037407
do_cmdline_cmd((char_u *)":let &isf = SaVe_ISF|unlet SaVe_ISF");
7408+
do_cmdline_cmd((char_u *)":let &wig = SaVe_WIG|unlet SaVe_WIG");
74047409
}
74057410

74067411
/* If wildcard expansion failed, we are editing the first file of the

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ static char *(features[]) =
766766

767767
static int included_patches[] =
768768
{ /* Add new patch number below this line */
769+
/**/
770+
1591,
769771
/**/
770772
1590,
771773
/**/

0 commit comments

Comments
 (0)