1
0
forked from aniani/vim

patch 8.1.0087: v:shell_error is always zero when using terminal for "!cmd"

Problem:    v:shell_error is always zero when using terminal for "!cmd".
Solution:   Use "exitval" of terminal-job. (Ozaki Kiichi, closes #2994)
This commit is contained in:
Bram Moolenaar
2018-06-19 19:59:20 +02:00
parent 1ceebb4efc
commit f9c3883b11
6 changed files with 80 additions and 25 deletions

View File

@@ -4365,6 +4365,7 @@ mch_call_shell_terminal(
char_u *tofree2 = NULL;
int retval = -1;
buf_T *buf;
job_T *job;
aco_save_T aco;
oparg_T oa; /* operator arguments */
@@ -4374,6 +4375,11 @@ mch_call_shell_terminal(
init_job_options(&opt);
ch_log(NULL, "starting terminal for system command '%s'", cmd);
buf = term_start(NULL, argv, &opt, TERM_START_SYSTEM);
if (buf == NULL)
goto theend;
job = term_getjob(buf->b_term);
++job->jv_refcount;
/* Find a window to make "buf" curbuf. */
aucmd_prepbuf(&aco, buf);
@@ -4391,9 +4397,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);