aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern

Browse Source 
Problem:    CTRL-G/CTRL-T don't work with incsearch and empty pattern.
Solution:   Use the last search pattern. (Christian Brabandt, closes #2292)
This commit is contained in:
Bram Moolenaar
2017-11-16 22:20:39 +01:00
parent 9c6ce0e622
commit d048009717
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_getln.c
View File

@@ -220,7 +220,7 @@ getcmdline(
pos_T match_end;
# ifdef FEAT_DIFF
int old_topfill;
int init_topfill = curwin->w_topfill;
int init_topfill = curwin->w_topfill;
# endif
linenr_T old_botline;
linenr_T init_botline = curwin->w_botline;
@@ -1715,11 +1715,17 @@ getcmdline(
if (p_is && !cmd_silent && (firstc == '/' || firstc == '?'))
{
pos_T t;
char_u *pat;
int search_flags = SEARCH_NOOF;
if (ccline.cmdlen == 0)
goto cmdline_not_changed;
if (firstc == ccline.cmdbuff[0])
pat = last_search_pattern();
else
pat = ccline.cmdbuff;
save_last_search_pattern();
cursor_off();
out_flush();
@@ -1739,7 +1745,7 @@ getcmdline(
++emsg_off;
i = searchit(curwin, curbuf, &t,
c == Ctrl_G ? FORWARD : BACKWARD,
ccline.cmdbuff, count, search_flags,
pat, count, search_flags,
RE_SEARCH, 0, NULL, NULL);
--emsg_off;
if (i)