diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-03-08 13:21:11 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-03-08 13:21:11 +0100 |
| commit | 4352d41db0d93ab9266c64be48eda872cb5ea589 (patch) | |
| tree | a10aa3db77c6db9c7c809200569a9bdd15119f92 /src/nvim/quickfix.c | |
| parent | 0355c1ed9c481d4ad3bf24887e0af869834e1b40 (diff) | |
| parent | 96e2c3945f13453070894c70c74e4da29d421dab (diff) | |
| download | rneovim-4352d41db0d93ab9266c64be48eda872cb5ea589.tar.gz rneovim-4352d41db0d93ab9266c64be48eda872cb5ea589.tar.bz2 rneovim-4352d41db0d93ab9266c64be48eda872cb5ea589.zip | |
Merge #9662 'vim-patch:8.0.{0643-0646}'
Diffstat (limited to 'src/nvim/quickfix.c')
| -rw-r--r-- | src/nvim/quickfix.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index f0c37c0e38..ee1cf2182f 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -2128,8 +2128,9 @@ win_found: save_cursor = curwin->w_cursor; curwin->w_cursor.lnum = 0; if (!do_search(NULL, '/', qf_ptr->qf_pattern, (long)1, - SEARCH_KEEP, NULL)) + SEARCH_KEEP, NULL, NULL)) { curwin->w_cursor = save_cursor; + } } if ((fdo_flags & FDO_QUICKFIX) && old_KeyTyped) @@ -3758,7 +3759,7 @@ void ex_vimgrep(exarg_T *eap) ++lnum) { col = 0; while (vim_regexec_multi(®match, curwin, buf, lnum, - col, NULL) > 0) { + col, NULL, NULL) > 0) { // Pass the buffer number so that it gets used even for a // dummy buffer, unless duplicate_name is set, then the // buffer will be wiped out below. |