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
index d747d8117933332e83b71d168c725716a77813e2..6e8a9049e7124977b6bb3061dd1da9919c7dfb81 100644 (file)
--- 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 44c517254f9d30080816cdeb3d62f621bff68240..3e22c3812ed78edf3318b262a31175e695bee6d4 100644 (file)
--- 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,
 /**/