patch 7.4.1302
Problem: Typo in struct field name. (Ken Takata)
Solution: Rename jf_pi to jv_pi.
diff --git a/src/eval.c b/src/eval.c
index 1e82246..10f57e8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21622,7 +21622,7 @@
"process %ld %s", (long)job->jv_pid, status);
# elif defined(WIN32)
vim_snprintf((char *)buf, NUMBUFLEN,
- "process %ld %s", (long)job->jf_pi.dwProcessId,
+ "process %ld %s", (long)job->jv_pi.dwProcessId,
status);
# else
/* fall-back */
diff --git a/src/os_win32.c b/src/os_win32.c
index 4917a7f..5841d13 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5050,7 +5050,7 @@
job->jv_status = JOB_FAILED;
else
{
- job->jf_pi = pi;
+ job->jv_pi = pi;
job->jv_status = JOB_STARTED;
}
}
@@ -5060,12 +5060,12 @@
{
DWORD dwExitCode = 0;
- if (!GetExitCodeProcess(job->jf_pi.hProcess, &dwExitCode))
+ if (!GetExitCodeProcess(job->jv_pi.hProcess, &dwExitCode))
return "dead";
if (dwExitCode != STILL_ACTIVE)
{
- CloseHandle(job->jf_pi.hProcess);
- CloseHandle(job->jf_pi.hThread);
+ CloseHandle(job->jv_pi.hProcess);
+ CloseHandle(job->jv_pi.hThread);
return "dead";
}
return "run";
@@ -5075,12 +5075,12 @@
mch_stop_job(job_T *job, char_u *how)
{
if (STRCMP(how, "kill") == 0)
- TerminateProcess(job->jf_pi.hProcess, 0);
+ TerminateProcess(job->jv_pi.hProcess, 0);
else
return GenerateConsoleCtrlEvent(
STRCMP(how, "hup") == 0 ?
CTRL_BREAK_EVENT : CTRL_C_EVENT,
- job->jf_pi.dwProcessId) ? OK : FAIL;
+ job->jv_pi.dwProcessId) ? OK : FAIL;
return OK;
}
#endif
diff --git a/src/structs.h b/src/structs.h
index d0823bc..1ce98d0 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1249,7 +1249,7 @@
int jv_exitval;
#endif
#ifdef WIN32
- PROCESS_INFORMATION jf_pi;
+ PROCESS_INFORMATION jv_pi;
#endif
jobstatus_T jv_status;
diff --git a/src/version.c b/src/version.c
index 3622533..e3f432e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1302,
+/**/
1301,
/**/
1300,