Mercurial > vim
diff src/eval.c @ 7933:1f0743f4f88f v7.4.1262
commit https://github.com/vim/vim/commit/a07fec9c85d062acd9dd433a2e681770f459ba47
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 5 21:04:08 2016 +0100
patch 7.4.1262
Problem: The channel callback is not invoked.
Solution: Make a list of pending callbacks.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 05 Feb 2016 21:15:04 +0100 |
| parents | 2679e636e862 |
| children | 3f2e0b62003d |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -9800,7 +9800,7 @@ f_ch_open(typval_T *argvars, typval_T *r * Otherwise returns -1. */ static int -send_common(typval_T *argvars, char_u *text, char *fun) +send_common(typval_T *argvars, char_u *text, int id, char *fun) { int ch_idx; char_u *callback = NULL; @@ -9815,10 +9815,10 @@ send_common(typval_T *argvars, char_u *t if (callback == NULL) return -1; } - /* Set the callback or clear it. An empty callback means no callback and - * not reading the response. */ - channel_set_req_callback(ch_idx, - callback != NULL && *callback == NUL ? NULL : callback); + /* Set the callback. An empty callback means no callback and not reading + * the response. */ + if (callback != NULL && *callback != NUL) + channel_set_req_callback(ch_idx, callback, id); if (channel_send(ch_idx, text, fun) == OK && callback == NULL) return ch_idx; @@ -9845,7 +9845,7 @@ f_ch_sendexpr(typval_T *argvars, typval_ if (text == NULL) return; - ch_idx = send_common(argvars, text, "sendexpr"); + ch_idx = send_common(argvars, text, id, "sendexpr"); vim_free(text); if (ch_idx >= 0) { @@ -9883,7 +9883,7 @@ f_ch_sendraw(typval_T *argvars, typval_T rettv->vval.v_string = NULL; text = get_tv_string_buf(&argvars[1], buf); - ch_idx = send_common(argvars, text, "sendraw"); + ch_idx = send_common(argvars, text, 0, "sendraw"); if (ch_idx >= 0) rettv->vval.v_string = channel_read_block(ch_idx); }