# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1465929906 -7200
# Node ID 4981cd0802c75a6c4e72d09172d3d0d4b31199d8
# Parent  07ee18c90e3a44830b44cd7e57ca88ce39df5127
commit https://github.com/vim/vim/commit/bee666f239eada035d288b77269aebc42f644ea6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jun 14 20:39:42 2016 +0200

    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)

diff --git a/src/gui.c b/src/gui.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1935,
+/**/
     1934,
 /**/
     1933,