0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2016-06-14 20:39:42 +02:00
parent 9bd3186052
commit bee666f239
2 changed files with 9 additions and 2 deletions

View File

@@ -5348,10 +5348,15 @@ gui_do_findrepl(
} }
else 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; i = msg_scroll;
(void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, (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 */ msg_scroll = i; /* don't let an error message set msg_scroll */
} }

View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1935,
/**/ /**/
1934, 1934,
/**/ /**/