thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2295: incsearch does not detect empty pattern properly

Browse Source 
Problem:    Incsearch does not detect empty pattern properly.
Solution:   Return magic state when skipping over a pattern. (Christian
            Brabandt, closes #7612, closes #6420)
This commit is contained in:
Bram Moolenaar
2021-01-04 12:42:13 +01:00
parent 82c38fe508
commit d93a7fc1a9
15 changed files with 125 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ex_cmds.c
View File

@@ -3672,7 +3672,7 @@ ex_substitute(exarg_T *eap)
delimiter = *cmd++; // remember delimiter character
pat = cmd; // remember start of search pat
cmd = skip_regexp_ex(cmd, delimiter, magic_isset(),
&eap->arg, NULL);
&eap->arg, NULL, NULL);
if (cmd[0] == delimiter) // end delimiter found
*cmd++ = NUL; // replace it with a NUL
}
@@ -4856,7 +4856,7 @@ ex_global(exarg_T *eap)
if (delim)
++cmd; // skip delimiter if there is one
pat = cmd; // remember start of pattern
cmd = skip_regexp_ex(cmd, delim, magic_isset(), &eap->arg, NULL);
cmd = skip_regexp_ex(cmd, delim, magic_isset(), &eap->arg, NULL, NULL);
if (cmd[0] == delim) // end delimiter found
*cmd++ = NUL; // replace it with a NUL
}