diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-06-10 13:24:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 13:24:45 -0400 |
| commit | dcd6cf5f3409f5fdab03bc82887efea02a597f3b (patch) | |
| tree | d65d1445fcf8befb2ea556b180bd3d05019f7bc1 /runtime | |
| parent | d8c5d122f1ba95bc71a78c5d70465bfa88623bd7 (diff) | |
| parent | d17e38e48209c19b63d809c5b807613f15aa03c8 (diff) | |
| download | rneovim-dcd6cf5f3409f5fdab03bc82887efea02a597f3b.tar.gz rneovim-dcd6cf5f3409f5fdab03bc82887efea02a597f3b.tar.bz2 rneovim-dcd6cf5f3409f5fdab03bc82887efea02a597f3b.zip | |
Merge pull request #11819 from erw7/fix-dot-net-stdin
[RDY] win: make UV_OVERLAPPED_PIPE optional
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/provider.vim | 5 | ||||
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 2 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/runtime/autoload/provider.vim b/runtime/autoload/provider.vim index dc24e801d0..803c1a0b1c 100644 --- a/runtime/autoload/provider.vim +++ b/runtime/autoload/provider.vim @@ -3,8 +3,11 @@ " Start the provider and perform a 'poll' request " " Returns a valid channel on success -function! provider#Poll(argv, orig_name, log_env) abort +function! provider#Poll(argv, orig_name, log_env, ...) abort let job = {'rpc': v:true, 'stderr_buffered': v:true} + if a:0 + let job = extend(job, a:1) + endif try let channel_id = jobstart(a:argv, job) if channel_id > 0 && rpcrequest(channel_id, 'poll') ==# 'ok' diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim index ffb9bf3021..e89d519790 100644 --- a/runtime/autoload/provider/pythonx.vim +++ b/runtime/autoload/provider/pythonx.vim @@ -19,7 +19,7 @@ function! provider#pythonx#Require(host) abort call add(args, plugin.path) endfor - return provider#Poll(args, a:host.orig_name, '$NVIM_PYTHON_LOG_FILE') + return provider#Poll(args, a:host.orig_name, '$NVIM_PYTHON_LOG_FILE', {'overlapped': v:true}) endfunction function! s:get_python_executable_from_host_var(major_version) abort diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 99bc526659..92f703a8a3 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5506,6 +5506,11 @@ jobstart({cmd}[, {opts}]) *jobstart()* stdout data. |on_stderr|: (function) Callback invoked when the job emits stderr data. + overlapped: (boolean) Set FILE_FLAG_OVERLAPPED for the + standard input/output passed to the child process. + Normally you do not need to set this. + (Only available on MS-Windows, On other + platforms, this option is silently ignored.) pty: (boolean) Connect the job to a new pseudo terminal, and its streams to the master file descriptor. Then `on_stderr` is ignored, |