mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 17:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4152 'vim-patch:7.4.{798,800,805,810,811,814,815,816,817,820,825}'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-02-09 01:58:54 -05:00
parent 17ae27190d 52692d3cd3
commit b9701c2a2b
10 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/fileio.c
View File

@@ -7160,10 +7160,11 @@ char_u * file_pat_to_reg_pat(
else
reg_pat[i++] = '^';
endp = pat_end - 1;
if (*endp == '*') {
while (endp - pat > 0 && *endp == '*')
if (endp >= pat && *endp == '*') {
while (endp - pat > 0 && *endp == '*') {
endp--;
add_dollar = FALSE;
}
add_dollar = false;
}
for (p = pat; *p && nested >= 0 && p <= endp; p++) {
switch (*p) {
@@ -7218,12 +7219,12 @@ char_u * file_pat_to_reg_pat(
#ifdef BACKSLASH_IN_FILENAME
&& no_bslash
#endif
)
) {
reg_pat[i++] = '?';
else if (*p == ',' || *p == '%' || *p == '#'
|| *p == ' ' || *p == '{' || *p == '}')
} else if (*p == ',' || *p == '%' || *p == '#'
|| ascii_isspace(*p) || *p == '{' || *p == '}') {
reg_pat[i++] = *p;
else if (*p == '\\' && p[1] == '\\' && p[2] == '{') {
} else if (*p == '\\' && p[1] == '\\' && p[2] == '{') {
reg_pat[i++] = '\\';
reg_pat[i++] = '{';
p += 2;