diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-01-11 02:19:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 02:19:11 +0100 |
commit | a08d2f54a0bd8cb9b6a4072a6adcc7eeee4690c2 (patch) | |
tree | ef535e346a41133994bd616bc5239a7d5c912955 /src | |
parent | 15c85d8462ce1cf58a162caccb2911c51bec7455 (diff) | |
parent | 9ecdce1d530aa2ae1db5982794f615050c3af05a (diff) | |
download | rneovim-a08d2f54a0bd8cb9b6a4072a6adcc7eeee4690c2.tar.gz rneovim-a08d2f54a0bd8cb9b6a4072a6adcc7eeee4690c2.tar.bz2 rneovim-a08d2f54a0bd8cb9b6a4072a6adcc7eeee4690c2.zip |
Merge #5910 from justinmk/win32-jobstart
Windows: fix jobstart()
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/eval.c | 6 | ||||
-rw-r--r-- | src/nvim/event/libuv_process.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 17e89e5757..1688a565c1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16994,8 +16994,12 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv, } // get shell command to execute - char **argv = tv_to_argv(&argvars[0], NULL, NULL); + bool executable = true; + char **argv = tv_to_argv(&argvars[0], NULL, &executable); if (!argv) { + if (!executable) { + set_vim_var_nr(VV_SHELL_ERROR, (long)-1); + } xfree(input); return; // Already did emsg. } diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c index a68badcc8f..907187aa17 100644 --- a/src/nvim/event/libuv_process.c +++ b/src/nvim/event/libuv_process.c @@ -19,8 +19,7 @@ bool libuv_process_spawn(LibuvProcess *uvproc) Process *proc = (Process *)uvproc; uvproc->uvopts.file = proc->argv[0]; uvproc->uvopts.args = proc->argv; - uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE - | UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS; + uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE; if (proc->detach) { uvproc->uvopts.flags |= UV_PROCESS_DETACHED; } |