mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10114 from erw7/vim-8.1.1270

Browse Source 
vim-patch:8.1.{0629,1270,1271,1283,1288,1289,1350,1375,1390,1475}
This commit is contained in:
Justin M. Keyes
2019-06-07 21:28:53 +02:00
committed by GitHub
parent d583b7c2fa 2a4e8a427e
commit f6f9e4a231
14 changed files with 518 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@@ -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