updated for version 7.1-238

diff --git a/src/eval.c b/src/eval.c
index 41e816ef00fc2920e0120887c718f2d15fa4f0f6..7093051b760f15d8ace0561fc518e3992884bdde 100644 (file)
--- 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 dcb5667fa0c16a8a635eb609bf88a1edb7afb953..2a259f79eec6f62ee7d7560ad17f9b417d34c48d 100644 (file)
--- 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,
 /**/