diff options
| author | Jaehwang Jerry Jung <tomtomjhj@gmail.com> | 2019-10-25 19:54:53 +0900 |
|---|---|---|
| committer | Jaehwang Jerry Jung <tomtomjhj@gmail.com> | 2019-10-27 03:35:19 +0900 |
| commit | 034077ed1c1fa71aa15829ed2dfb27de4a5e5359 (patch) | |
| tree | 9f819d83c0c5848e51972c098ce85fce68b39be4 /src/nvim/ex_getln.c | |
| parent | 19ba36d0e1bb4ef28f8aa92c7386345fbcf78cf2 (diff) | |
| download | rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.tar.gz rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.tar.bz2 rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.zip | |
vim-patch:8.1.2173: searchit() has too many arguments
Problem: Searchit() has too many arguments.
Solution: Move optional arguments to a struct. Add the "wrapped" argument.
https://github.com/vim/vim/commit/92ea26b925a0835badb0af2d5887238a4198cabb
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) { |