diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-26 12:50:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 12:50:51 -0700 |
| commit | ad532d3c660791337a9ea5100ab1e330480e382a (patch) | |
| tree | 6142d4a147f26451a8679d441930f7691cecfdc3 /src/nvim/ex_getln.c | |
| parent | 4b5e2f7a0b275230456f92892a89c781616284a8 (diff) | |
| parent | 6dcc1d100572b462f75f64f7e98a0b5d80144cba (diff) | |
| download | rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.tar.gz rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.tar.bz2 rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.zip | |
Merge #11294 from tomtomjhj/vim-8.1.2173
vim-patch:8.1.{2173,2207,2218}
Diffstat (limited to 'src/nvim/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 5235b9e648..f2665ca0b5 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1075,7 +1075,7 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match) int found = searchit(curwin, curbuf, &t, NULL, next_match ? FORWARD : BACKWARD, pat, s->count, search_flags, - RE_SEARCH, 0, NULL, NULL); + RE_SEARCH, NULL); emsg_off--; ui_busy_stop(); if (found) { @@ -1818,6 +1818,7 @@ static int command_line_changed(CommandLineState *s) if (p_is && !cmd_silent && (s->firstc == '/' || s->firstc == '?')) { pos_T end_pos; proftime_T tm; + searchit_arg_T sia; // if there is a character waiting, search and redraw later if (char_avail()) { @@ -1844,8 +1845,10 @@ static int command_line_changed(CommandLineState *s) if (!p_hls) { search_flags += SEARCH_KEEP; } + memset(&sia, 0, sizeof(sia)); + sia.sa_tm = &tm; i = do_search(NULL, s->firstc, ccline.cmdbuff, s->count, - search_flags, &tm, NULL); + search_flags, &sia); emsg_off--; // if interrupted while searching, behave like it failed if (got_int) { |