diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-08 22:03:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-08 22:03:14 +0100 |
| commit | 20586cb4f4d516a60b96cc02a94b810fea8b8cdb (patch) | |
| tree | b82b3c2a1ae3e9204eccd1b098e72f8382740c72 | |
| parent | 1a840240376f2858d489736f9eed6d2975225fdf (diff) | |
patch 8.0.1591: MS-Windows: when reparsing the arguments 'wildignore' mattersv8.0.1591
Problem: MS-Windows: when reparsing the arguments 'wildignore' matters.
Solution: Save and reset 'wildignore'. (Yasuhiro Matsumoto, closes #2702)
| -rw-r--r-- | src/os_win32.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 4dc446be20..0199996a86 100644 --- 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 21b9cdc804..f4e7e737b7 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1591, +/**/ 1590, /**/ 1589, |