diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-06-19 19:59:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-06-19 19:59:20 +0200 |
| commit | f9c3883b11b33f0c548df5e949ba59fde74d3e7b (patch) | |
| tree | ab21fb8c95cc6f094925f89752989a41628a0be1 /src/os_win32.c | |
| parent | 1ceebb4efc455dc6c34e0cd2c2adbd00939f038b (diff) | |
| download | vim-git-f9c3883b11b33f0c548df5e949ba59fde74d3e7b.tar.gz | |
patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"v8.1.0087
Problem: v:shell_error is always zero when using terminal for "!cmd".
Solution: Use "exitval" of terminal-job. (Ozaki Kiichi, closes #2994)
Diffstat (limited to 'src/os_win32.c')
| -rw-r--r-- | src/os_win32.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index bece2c4c6..f8884e401 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4796,6 +4796,7 @@ mch_call_shell_terminal( long_u cmdlen; int retval = -1; buf_T *buf; + job_T *job; aco_save_T aco; oparg_T oa; /* operator arguments */ @@ -4826,6 +4827,9 @@ mch_call_shell_terminal( if (buf == NULL) return 255; + job = term_getjob(buf->b_term); + ++job->jv_refcount; + /* Find a window to make "buf" curbuf. */ aucmd_prepbuf(&aco, buf); @@ -4842,9 +4846,11 @@ mch_call_shell_terminal( else normal_cmd(&oa, TRUE); } - retval = 0; + retval = job->jv_exitval; ch_log(NULL, "system command finished"); + job_unref(job); + /* restore curwin/curbuf and a few other things */ aucmd_restbuf(&aco); |