diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-22 21:50:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-22 21:50:18 +0200 |
| commit | df48fb456fb6bf63d94cad9b302ff01d8ee8d311 (patch) | |
| tree | e40ac7facad1b205bf5990a535c8c1686fbeb05b /src/channel.c | |
| parent | 36edf0685c8b55ee3ce709058d83ada8027fec1e (diff) | |
| download | vim-git-df48fb456fb6bf63d94cad9b302ff01d8ee8d311.tar.gz | |
patch 7.4.2090v7.4.2090
Problem: Using submatch() in a lambda passed to substitute() is verbose.
Solution: Use a static list and pass it as an optional argument to the
function. Fix memory leak.
Diffstat (limited to 'src/channel.c')
| -rw-r--r-- | src/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/channel.c b/src/channel.c index ae5bdf220..722dcb8de 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1533,8 +1533,8 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial, argv[0].v_type = VAR_CHANNEL; argv[0].vval.v_channel = channel; - call_func(callback, (int)STRLEN(callback), - &rettv, 2, argv, 0L, 0L, &dummy, TRUE, partial, NULL); + call_func(callback, (int)STRLEN(callback), &rettv, 2, argv, NULL, + 0L, 0L, &dummy, TRUE, partial, NULL); clear_tv(&rettv); channel_need_redraw = TRUE; } @@ -2695,7 +2695,7 @@ channel_close(channel_T *channel, int invoke_close_cb) argv[0].v_type = VAR_CHANNEL; argv[0].vval.v_channel = channel; call_func(channel->ch_close_cb, (int)STRLEN(channel->ch_close_cb), - &rettv, 1, argv, 0L, 0L, &dummy, TRUE, + &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE, channel->ch_close_partial, NULL); clear_tv(&rettv); channel_need_redraw = TRUE; @@ -4758,7 +4758,7 @@ job_status(job_T *job) argv[1].v_type = VAR_NUMBER; argv[1].vval.v_number = job->jv_exitval; call_func(job->jv_exit_cb, (int)STRLEN(job->jv_exit_cb), - &rettv, 2, argv, 0L, 0L, &dummy, TRUE, + &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, job->jv_exit_partial, NULL); clear_tv(&rettv); --job->jv_refcount; |