summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-11-26 18:59:19 +0000
committerBram Moolenaar <Bram@vim.org>2022-11-26 18:59:19 +0000
commit837ca8f43b9d6b8574a2bfdae219b17c84411730 (patch)
tree8c605645e82f033f047cffbe6c5e89a85cc723db
parentf3f198b6349fe252b72975701e2f17d932b19c70 (diff)
patch 9.0.0953: part of making search more efficient is missingv9.0.0953
Problem: Part of making search more efficient is missing. Solution: Add the change in searchit().
-rw-r--r--src/search.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/search.c b/src/search.c
index a4ec4448a0..ff4f419da3 100644
--- 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 758c4b56a3..d16ff108ef 100644
--- 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,