diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-30 02:02:55 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-30 02:02:55 +0300 |
| commit | b588ccddd7f5998ce7d9780463480ca844963859 (patch) | |
| tree | 78f1e0f58209385aa63e0e25e071a5893635790d /runtime/autoload/provider/pythonx.vim | |
| parent | de45ec0146486c49719ff6f6dcceb4914b471c7a (diff) | |
| parent | 4618c9c43b2fe052332329b347ac10b4b1db94b5 (diff) | |
| download | rneovim-b588ccddd7f5998ce7d9780463480ca844963859.tar.gz rneovim-b588ccddd7f5998ce7d9780463480ca844963859.tar.bz2 rneovim-b588ccddd7f5998ce7d9780463480ca844963859.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'runtime/autoload/provider/pythonx.vim')
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim index 1c77eabe23..7285ed43ea 100644 --- a/runtime/autoload/provider/pythonx.vim +++ b/runtime/autoload/provider/pythonx.vim @@ -5,7 +5,7 @@ endif let s:loaded_pythonx_provider = 1 -let s:job_opts = {'rpc': v:true, 'stderr_buffered': v:true} +let s:job_opts = {'rpc': v:true, 'on_stderr': function('provider#stderr_collector')} function! provider#pythonx#Require(host) abort let ver = (a:host.orig_name ==# 'python') ? 2 : 3 @@ -21,17 +21,18 @@ function! provider#pythonx#Require(host) abort endfor try - let job = copy(s:job_opts) - let channel_id = jobstart(args, job) + let channel_id = jobstart(args, s:job_opts) if rpcrequest(channel_id, 'poll') ==# 'ok' return channel_id endif catch echomsg v:throwpoint echomsg v:exception - for row in job.stderr + for row in provider#get_stderr(channel_id) echomsg row endfor + finally + call provider#clear_stderr(channel_id) endtry throw remote#host#LoadErrorForHost(a:host.orig_name, \ '$NVIM_PYTHON_LOG_FILE') |