diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-11 20:48:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-11 20:48:34 +0100 |
| commit | b6a4fee37ebbb0c76f2fbda7d06cbf48a3a07e8d (patch) | |
| tree | 55e20b910a31fafee6732df26cf2eca2c18e9fb3 /src/eval.c | |
| parent | 6119e6156e024d9047bbfeb7cdfdae259f9e1b92 (diff) | |
| download | vim-b6a4fee37ebbb0c76f2fbda7d06cbf48a3a07e8d.zip | |
patch 7.4.1303
Problem: A Funcref is not accepted as a callback.
Solution: Make a Funcref work. (Damien)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/eval.c b/src/eval.c index 10f57e8b1..42f305e4a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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) { |