aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1303

Browse Source 
Problem:    A Funcref is not accepted as a callback.
Solution:   Make a Funcref work. (Damien)
This commit is contained in:
Bram Moolenaar
2016-02-11 20:48:34 +01:00
parent 6119e6156e
commit b6a4fee37e
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/eval.c
View File

@@ -9871,12 +9871,13 @@ f_ch_open(typval_T *argvars, typval_T *rettv)
if (argvars[1].v_type == VAR_DICT)
{
/* parse argdict */
dict_T *dict = argvars[1].vval.v_dict;
dict_T *dict = argvars[1].vval.v_dict;
dictitem_T *item;
if (dict_find(dict, (char_u *)"mode", -1) != NULL)
/* parse argdict */
if ((item = dict_find(dict, (char_u *)"mode", -1)) != NULL)
{
mode = get_dict_string(dict, (char_u *)"mode", FALSE);
mode = get_tv_string(&item->di_tv);
if (STRCMP(mode, "raw") == 0)
ch_mode = MODE_RAW;
else if (STRCMP(mode, "js") == 0)
@@ -9889,12 +9890,12 @@ f_ch_open(typval_T *argvars, typval_T *rettv)
return;
}
}
if (dict_find(dict, (char_u *)"waittime", -1) != NULL)
waittime = get_dict_number(dict, (char_u *)"waittime");
if (dict_find(dict, (char_u *)"timeout", -1) != NULL)
timeout = get_dict_number(dict, (char_u *)"timeout");
if (dict_find(dict, (char_u *)"callback", -1) != NULL)
callback = get_dict_string(dict, (char_u *)"callback", FALSE);
if ((item = dict_find(dict, (char_u *)"waittime", -1)) != NULL)
waittime = get_tv_number(&item->di_tv);
if ((item = dict_find(dict, (char_u *)"timeout", -1)) != NULL)
timeout = get_tv_number(&item->di_tv);
if ((item = dict_find(dict, (char_u *)"callback", -1)) != NULL)
callback = get_callback(&item->di_tv);
}
if (waittime < 0 || timeout < 0)
{