From bee666f239eada035d288b77269aebc42f644ea6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 14 Jun 2016 20:39:42 +0200
Subject: [PATCH] patch 7.4.1935 Problem: When using the GUI search/replace
a second match right after the replacement is skipped. Solution:
Add the SEARCH_START flag. (Mleddy)
---
src/gui.c | 9 +++++++--
src/version.c | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/gui.c b/src/gui.c
index d747d8117..6e8a9049e 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -5348,10 +5348,15 @@ gui_do_findrepl(
}
else
{
- /* Search for the next match. */
+ int searchflags = SEARCH_MSG + SEARCH_MARK;
+
+ /* Search for the next match.
+ * Don't skip text under cursor for single replace. */
+ if (type == FRD_REPLACE)
+ searchflags += SEARCH_START;
i = msg_scroll;
(void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L,
- SEARCH_MSG + SEARCH_MARK, NULL);
+ searchflags, NULL);
msg_scroll = i; /* don't let an error message set msg_scroll */
}
diff --git a/src/version.c b/src/version.c
index 44c517254..3e22c3812 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1935,
/**/
1934,
/**/
--
2.40.0