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/eval.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/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 998d0568ce..a45ca5c63e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -14139,7 +14139,7 @@ static int search_cmn(typval_T *argvars, pos_T *match_pos, int *flagsp) } pos = save_cursor = curwin->w_cursor; - subpatnum = searchit(curwin, curbuf, &pos, dir, (char_u *)pat, 1, + subpatnum = searchit(curwin, curbuf, &pos, NULL, dir, (char_u *)pat, 1, options, RE_SEARCH, (linenr_T)lnum_stop, &tm, NULL); if (subpatnum != FAIL) { if (flags & SP_SUBPAT) @@ -14657,7 +14657,7 @@ do_searchpair( clearpos(&foundpos); pat = pat3; for (;; ) { - n = searchit(curwin, curbuf, &pos, dir, pat, 1L, + n = searchit(curwin, curbuf, &pos, NULL, dir, pat, 1L, options, RE_SEARCH, lnum_stop, &tm, NULL); if (n == FAIL || (firstpos.lnum != 0 && equalpos(pos, firstpos))) { // didn't find it or found the first match again: FAIL |