0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 7.4.2356

Problem:    Reading past end of line when using previous substitute pattern.
            (Dominique Pelle)
Solution:   Don't set "pat" only set "searchstr".
This commit is contained in:
Bram Moolenaar 2016-09-09 21:41:34 +02:00
parent 16b3578f35
commit ea683da58c
3 changed files with 15 additions and 3 deletions

View File

@ -1240,14 +1240,13 @@ do_search(
{
if (spats[RE_SEARCH].pat == NULL) /* no previous pattern */
{
pat = spats[RE_SUBST].pat;
if (pat == NULL)
searchstr = spats[RE_SUBST].pat;
if (searchstr == NULL)
{
EMSG(_(e_noprevre));
retval = 0;
goto end_do_search;
}
searchstr = pat;
}
else
{

View File

@ -268,3 +268,14 @@ func Test_search_cmdline2()
call test_disable_char_avail(0)
bw!
endfunc
func Test_use_sub_pat()
split
let @/ = ''
func X()
s/^/a/
/
endfunc
call X()
bwipe!
endfunc

View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2356,
/**/
2355,
/**/