Mercurial > vim

changeset 266:e7904492cb75 v7.0071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0071
author vimboss
date Sun, 24 Apr 2005 22:09:56 +0000
parents 8e2cc4452728
children ca33bc409682
files src/eval.c
diffstat 1 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -12061,6 +12061,7 @@ f_searchpair(argvars, rettv)
     char_u	*pat, *pat2, *pat3;
     pos_T	pos;
     pos_T	firstpos;
+    pos_T	foundpos;
     pos_T	save_cursor;
     pos_T	save_pos;
     int		save_p_ws = p_ws;
@@ -12114,6 +12115,7 @@ f_searchpair(argvars, rettv)
     save_cursor = curwin->w_cursor;
     pos = curwin->w_cursor;
     firstpos.lnum = 0;
+    foundpos.lnum = 0;
     pat = pat3;
     for (;;)
     {
@@ -12125,6 +12127,17 @@ f_searchpair(argvars, rettv)
 
 	if (firstpos.lnum == 0)
 	    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 (*skip != NUL)