summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-21 19:32:02 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-21 19:32:02 +0100
commiteab089d22f172ddd2d33367a998e68c2f1c6c989 (patch)
tree2034b685a1314a1dea8ba9fd3d165163cf6a873e
parentee1cffc07a42441924c5353af7fd7ab6e97e5aae (diff)
patch 7.4.1381v7.4.1381
Problem: Exit value not available on MS-Windows. Solution: Set the exit value.
-rw-r--r--src/os_win32.c1
-rw-r--r--src/structs.h2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 631f88e495..047045047e 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5127,6 +5127,7 @@ mch_job_status(job_T *job)
|| dwExitCode != STILL_ACTIVE)
{
job->jv_status = JOB_ENDED;
+ job->jv_exitval = (int)dwExitCode;
return "dead";
}
return "run";
diff --git a/src/structs.h b/src/structs.h
index b67f48a855..e1720ce389 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1257,7 +1257,6 @@ struct jobvar_S
job_T *jv_prev;
#ifdef UNIX
pid_t jv_pid;
- int jv_exitval;
#endif
#ifdef WIN32
PROCESS_INFORMATION jv_proc_info;
@@ -1265,6 +1264,7 @@ struct jobvar_S
#endif
jobstatus_T jv_status;
char_u *jv_stoponexit; /* allocated */
+ int jv_exitval;
char_u *jv_exit_cb; /* allocated */
int jv_refcount; /* reference count */
diff --git a/src/version.c b/src/version.c
index b6153549c9..144dc18b78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1381,
+/**/
1380,
/**/
1379,