mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval: Make setmatches() return -1 in case of some failures

Browse Source
This commit is contained in:
ZyX
2016-08-20 22:25:57 +03:00
parent e18a578308
commit 54bd2e8b73
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/eval.c
View File

@@ -14680,6 +14680,7 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
clear_matches(curwin);
li = l->lv_first;
bool match_add_failed = false;
while (li != NULL) {
int i = 0;
@@ -14728,17 +14729,23 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
&conceal_di->di_tv)
: NULL);
if (i == 0) {
match_add(curwin, group,
tv_dict_get_string(d, "pattern", false),
priority, id, NULL, conceal);
if (match_add(curwin, group,
tv_dict_get_string(d, "pattern", false),
priority, id, NULL, conceal) != id) {
match_add_failed = true;
}
} else {
match_add(curwin, group, NULL, priority, id, s, conceal);
if (match_add(curwin, group, NULL, priority, id, s, conceal) != id) {
match_add_failed = true;
}
tv_list_unref(s);
s = NULL;
}
li = li->li_next;
}
rettv->vval.v_number = 0;
if (!match_add_failed) {
rettv->vval.v_number = 0;
}
}
}