From 92de73db658ac93f733db45fc399ec84b82ae703 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 22 Jan 2008 10:59:38 +0000 Subject: updated for version 7.1-238 --- src/eval.c | 7 +++++++ src/version.c | 2 ++ 2 files changed, 9 insertions(+) (limited to 'src') diff --git a/src/eval.c b/src/eval.c index 41e816ef00..7093051b76 100644 --- a/src/eval.c +++ b/src/eval.c @@ -14189,6 +14189,10 @@ searchpair_cmn(argvars, match_pos) goto theend; } + /* Using 'r' implies 'W', otherwise it doesn't work. */ + if (flags & SP_REPEAT) + p_ws = FALSE; + /* Optional fifth argument: skip expression */ if (argvars[3].v_type == VAR_UNKNOWN || argvars[4].v_type == VAR_UNKNOWN) @@ -14345,6 +14349,9 @@ do_searchpair(spat, mpat, epat, dir, skip, flags, match_pos, } foundpos = pos; + /* clear the start flag to avoid getting stuck here */ + options &= ~SEARCH_START; + /* If the skip pattern matches, ignore this match. */ if (*skip != NUL) { diff --git a/src/version.c b/src/version.c index dcb5667fa0..2a259f79ee 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 238, /**/ 237, /**/ -- cgit v1.2.3