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:
parent
16b3578f35
commit
ea683da58c
@ -1240,14 +1240,13 @@ do_search(
|
|||||||
{
|
{
|
||||||
if (spats[RE_SEARCH].pat == NULL) /* no previous pattern */
|
if (spats[RE_SEARCH].pat == NULL) /* no previous pattern */
|
||||||
{
|
{
|
||||||
pat = spats[RE_SUBST].pat;
|
searchstr = spats[RE_SUBST].pat;
|
||||||
if (pat == NULL)
|
if (searchstr == NULL)
|
||||||
{
|
{
|
||||||
EMSG(_(e_noprevre));
|
EMSG(_(e_noprevre));
|
||||||
retval = 0;
|
retval = 0;
|
||||||
goto end_do_search;
|
goto end_do_search;
|
||||||
}
|
}
|
||||||
searchstr = pat;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -268,3 +268,14 @@ func Test_search_cmdline2()
|
|||||||
call test_disable_char_avail(0)
|
call test_disable_char_avail(0)
|
||||||
bw!
|
bw!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_use_sub_pat()
|
||||||
|
split
|
||||||
|
let @/ = ''
|
||||||
|
func X()
|
||||||
|
s/^/a/
|
||||||
|
/
|
||||||
|
endfunc
|
||||||
|
call X()
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
@ -763,6 +763,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2356,
|
||||||
/**/
|
/**/
|
||||||
2355,
|
2355,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user