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)

diff --git a/src/os_win32.c b/src/os_win32.c
index 4dc446be20cb6e68ad27232f110771f8fb688d78..0199996a869eb8bf71837bdaa345643a8601583e 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -7397,10 +7397,15 @@ fix_arg_enc(void)
        /* Now expand wildcards in the arguments. */
        /* Temporarily add '(' and ')' to 'isfname'.  These are valid
         * filename characters but are excluded from 'isfname' to make
-        * "gf" work on a file name in parenthesis (e.g.: see vim.h). */
+        * "gf" work on a file name in parenthesis (e.g.: see vim.h).
+        * Also, unset wildignore to not be influenced by this option.
+        * The arguments specified in command-line should be kept even if
+        * encoding options were changed. */
        do_cmdline_cmd((char_u *)":let SaVe_ISF = &isf|set isf+=(,)");
+       do_cmdline_cmd((char_u *)":let SaVe_WIG = &wig|set wig=");
        alist_expand(fnum_list, used_alist_count);
        do_cmdline_cmd((char_u *)":let &isf = SaVe_ISF|unlet SaVe_ISF");
+       do_cmdline_cmd((char_u *)":let &wig = SaVe_WIG|unlet SaVe_WIG");
     }
 
     /* If wildcard expansion failed, we are editing the first file of the

diff --git a/src/version.c b/src/version.c
index 21b9cdc804bbdce93b8239ddca0d47792f855b9b..f4e7e737b7dd9c910067915effbb846f08325f64 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1591,
 /**/
     1590,
 /**/