diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-07 21:28:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 21:28:53 +0200 |
| commit | f6f9e4a231708ca45e6dc08def78d9ff12339976 (patch) | |
| tree | 87f7c240bb7e888241dfe4a46117c582da51e2be /src/nvim/edit.c | |
| parent | d583b7c2fac99447eb6dfe47b458747f59275aa5 (diff) | |
| parent | 2a4e8a427e5e84f8e8a9477c0bfb8c1d376b3f1e (diff) | |
| download | rneovim-f6f9e4a231708ca45e6dc08def78d9ff12339976.tar.gz rneovim-f6f9e4a231708ca45e6dc08def78d9ff12339976.tar.bz2 rneovim-f6f9e4a231708ca45e6dc08def78d9ff12339976.zip | |
Merge #10114 from erw7/vim-8.1.1270
vim-patch:8.1.{0629,1270,1271,1283,1288,1289,1350,1375,1390,1475}
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 5ac95b64e7..9af003f140 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -4045,13 +4045,15 @@ static int ins_compl_get_exp(pos_T *ini) if (CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode) || (compl_cont_status & CONT_SOL)) { found_new_match = search_for_exact_line(ins_buf, pos, - compl_direction, compl_pattern); - } else - found_new_match = searchit(NULL, ins_buf, pos, + compl_direction, + compl_pattern); + } else { + found_new_match = searchit(NULL, ins_buf, pos, NULL, compl_direction, compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG, RE_LAST, (linenr_T)0, NULL, NULL); + } msg_silent--; if (!compl_started || set_match_pos) { /* set "compl_started" even on fail */ |