diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-08-20 12:58:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 12:58:37 +0200 |
| commit | 71b3e20d0fba20d4957c1949352bde1744a0a947 (patch) | |
| tree | 7844b2d185b27a0303183e90792a5ef807933e88 /src/nvim/os/shell.c | |
| parent | 1b825a9ada4d89059645bc7a458e1e8d931c6161 (diff) | |
| parent | 2d60a15e25f487eda1ac00a9e6cdf9a6564fb416 (diff) | |
| download | rneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.tar.gz rneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.tar.bz2 rneovim-71b3e20d0fba20d4957c1949352bde1744a0a947.zip | |
Merge pull request #4723 from bfredl/rpcstderr
allow stderr handler for rpc jobs and use it to display python/ruby startup error
Diffstat (limited to 'src/nvim/os/shell.c')
| -rw-r--r-- | src/nvim/os/shell.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 64c673930a..ba52b9f661 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -236,10 +236,10 @@ static int do_os_system(char **argv, } proc->out->events = NULL; rstream_init(proc->out, 0); - rstream_start(proc->out, data_cb); + rstream_start(proc->out, data_cb, &buf); proc->err->events = NULL; rstream_init(proc->err, 0); - rstream_start(proc->err, data_cb); + rstream_start(proc->err, data_cb, &buf); // write the input, if any if (input) { @@ -251,7 +251,7 @@ static int do_os_system(char **argv, return -1; } // close the input stream after everything is written - wstream_set_write_cb(&in, shell_write_cb); + wstream_set_write_cb(&in, shell_write_cb, NULL); } // invoke busy_start here so event_poll_until wont change the busy state for @@ -546,5 +546,5 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer, static void shell_write_cb(Stream *stream, void *data, int status) { - stream_close(stream, NULL); + stream_close(stream, NULL, NULL); } |