aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.0071

Browse Source
This commit is contained in:
Bram Moolenaar
2005-04-24 22:09:56 +00:00
parent dba8a917ba
commit c9a2d2e240
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/eval.c
View File

@@ -12061,6 +12061,7 @@ f_searchpair(argvars, rettv)
char_u *pat, *pat2, *pat3; char_u *pat, *pat2, *pat3;
pos_T pos; pos_T pos;
pos_T firstpos; pos_T firstpos;
pos_T foundpos;
pos_T save_cursor; pos_T save_cursor;
pos_T save_pos; pos_T save_pos;
int save_p_ws = p_ws; int save_p_ws = p_ws;
@@ -12114,6 +12115,7 @@ f_searchpair(argvars, rettv)
save_cursor = curwin->w_cursor; save_cursor = curwin->w_cursor;
pos = curwin->w_cursor; pos = curwin->w_cursor;
firstpos.lnum = 0; firstpos.lnum = 0;
foundpos.lnum = 0;
pat = pat3; pat = pat3;
for (;;) for (;;)
{ {
@@ -12125,6 +12127,17 @@ f_searchpair(argvars, rettv)
if (firstpos.lnum == 0) if (firstpos.lnum == 0)
firstpos = pos; firstpos = pos;
if (equalpos(pos, foundpos))
{
/* Found the same position again. Can happen with a pattern that
* has "\zs" at the end and searching backwards. Advance one
* character and try again. */
if (dir == BACKWARD)
decl(&pos);
else
incl(&pos);
}
foundpos = pos;
/* If the skip pattern matches, ignore this match. */ /* If the skip pattern matches, ignore this match. */
if (*skip != NUL) if (*skip != NUL)