Skip to content
Snippets Groups Projects
Commit 49315f65 authored by Bram Moolenaar's avatar Bram Moolenaar
Browse files

updated for version 7.0192

parent 1ef15e30
No related merge requests found
...@@ -5126,10 +5126,11 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags) ...@@ -5126,10 +5126,11 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
else if (pat[i][j] == '\\' && pat[i][j + 1] != NUL) else if (pat[i][j] == '\\' && pat[i][j + 1] != NUL)
{ {
/* Remove a backslash, take char literally. But keep /* Remove a backslash, take char literally. But keep
* backslash before special character and inside * backslash inside backticks, before a special character
* backticks. */ * and before a backtick. */
if (intick if (intick
|| vim_strchr(SHELL_SPECIAL, pat[i][j + 1]) != NULL) || vim_strchr(SHELL_SPECIAL, pat[i][j + 1]) != NULL
|| pat[i][j + 1] == '`')
*p++ = '\\'; *p++ = '\\';
++j; ++j;
} }
...@@ -5356,7 +5357,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags) ...@@ -5356,7 +5357,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
/* Space or NL separates */ /* Space or NL separates */
if (shell_style == STYLE_ECHO || shell_style == STYLE_BT) if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
{ {
while (!(shell_style == STYLE_ECHO && *p == ' ') && *p != '\n') while (!(shell_style == STYLE_ECHO && *p == ' ')
&& *p != '\n' && *p != NUL)
++p; ++p;
if (p == buffer + len) /* last entry */ if (p == buffer + len) /* last entry */
*p = NUL; *p = NUL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment