changeset 31239:7802100bdfd3 v9.0.0953

patch 9.0.0953: part of making search more efficient is missing Commit: https://github.com/vim/vim/commit/837ca8f43b9d6b8574a2bfdae219b17c84411730 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 26 18:59:19 2022 +0000 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().
author Bram Moolenaar <Bram@vim.org>
date Sat, 26 Nov 2022 20:00:03 +0100
parents 029014c0abe5
children 9779faf6478c
files src/search.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    953,
+/**/
     952,
 /**/
     951,