patch 9.0.0953: part of making search more efficient is missing

Problem:    Part of making search more efficient is missing.
Solution:   Add the change in searchit().

diff --git a/src/search.c b/src/search.c
index a4ec4448a0cc2e9826e1f0e0397a8e4fd1c4114a..ff4f419da3b8b030570454934b3ac275dcdfb4a8 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -793,7 +793,6 @@ searchit(
                    if (dir == FORWARD && at_first_line)
                    {
                        match_ok = TRUE;
-                       matchcol = col;
 
                        /*
                         * When the match starts in a next line it's certainly
@@ -840,8 +839,9 @@ searchit(
                            else
                            {
                                // Advance "matchcol" to the next character.
-                               // This does not use matchpos.col, because
-                               // "\zs" may have have set it.
+                               // This uses rmm_matchcol, the actual start of
+                               // the match, ignoring "\zs".
+                               matchcol = regmatch.rmm_matchcol;
                                if (ptr[matchcol] != NUL)
                                {
                                    if (has_mbyte)

diff --git a/src/version.c b/src/version.c
index 758c4b56a33f1d37c1ce8b921c0e9a68497efccf..d16ff108efc5b221de99b6f5a139ce09a3e8c7c9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    953,
 /**/
     952,
 /**/