diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-22 10:59:38 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-22 10:59:38 +0000 |
| commit | 92de73db658ac93f733db45fc399ec84b82ae703 (patch) | |
| tree | 9b016f552794689373d2285c6014fae6265c773c /src | |
| parent | e9e3b57915c3e6ca6a156129e9bbc0f90d65a4bb (diff) | |
updated for version 7.1-238v7.1.238
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 238, +/**/ 237, /**/ 236, |