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

patch 9.0.1555: setcharsearch() does not clear last searched char properly

Browse Source 
Problem:    setcharsearch() does not clear last searched char properly.
Solution:   Do not accept lastc_bytelen smaller than one. (closes #12398)
This commit is contained in:
zeertzjq
2023-05-14 17:39:18 +01:00
committed by Bram Moolenaar
parent e42c27d9e8
commit e5d91ba1de
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/search.c
View File

@@ -496,7 +496,7 @@ last_csearch_until(void)
}
void
set_last_csearch(int c, char_u *s UNUSED, int len UNUSED)
set_last_csearch(int c, char_u *s, int len)
{
*lastc = c;
lastc_bytelen = len;
@@ -1789,7 +1789,7 @@ searchc(cmdarg_T *cap, int t_cmd)
}
else // repeat previous search
{
if (*lastc == NUL && lastc_bytelen == 1)
if (*lastc == NUL && lastc_bytelen <= 1)
return FAIL;
if (dir) // repeat in opposite direction
dir = -lastcdir;
@@ -1833,7 +1833,7 @@ searchc(cmdarg_T *cap, int t_cmd)
return FAIL;
col -= (*mb_head_off)(p, p + col - 1) + 1;
}
if (lastc_bytelen == 1)
if (lastc_bytelen <= 1)
{
if (p[col] == c && stop)
break;