Skip to content

Commit 6119e61

Browse files
committed
patch 7.4.1302
Problem: Typo in struct field name. (Ken Takata) Solution: Rename jf_pi to jv_pi.
1 parent 39b2127 commit 6119e61

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/eval.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21622,7 +21622,7 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf)
2162221622
"process %ld %s", (long)job->jv_pid, status);
2162321623
# elif defined(WIN32)
2162421624
vim_snprintf((char *)buf, NUMBUFLEN,
21625-
"process %ld %s", (long)job->jf_pi.dwProcessId,
21625+
"process %ld %s", (long)job->jv_pi.dwProcessId,
2162621626
status);
2162721627
# else
2162821628
/* fall-back */

src/os_win32.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -5050,7 +5050,7 @@ mch_start_job(char *cmd, job_T *job)
50505050
job->jv_status = JOB_FAILED;
50515051
else
50525052
{
5053-
job->jf_pi = pi;
5053+
job->jv_pi = pi;
50545054
job->jv_status = JOB_STARTED;
50555055
}
50565056
}
@@ -5060,12 +5060,12 @@ mch_job_status(job_T *job)
50605060
{
50615061
DWORD dwExitCode = 0;
50625062

5063-
if (!GetExitCodeProcess(job->jf_pi.hProcess, &dwExitCode))
5063+
if (!GetExitCodeProcess(job->jv_pi.hProcess, &dwExitCode))
50645064
return "dead";
50655065
if (dwExitCode != STILL_ACTIVE)
50665066
{
5067-
CloseHandle(job->jf_pi.hProcess);
5068-
CloseHandle(job->jf_pi.hThread);
5067+
CloseHandle(job->jv_pi.hProcess);
5068+
CloseHandle(job->jv_pi.hThread);
50695069
return "dead";
50705070
}
50715071
return "run";
@@ -5075,12 +5075,12 @@ mch_job_status(job_T *job)
50755075
mch_stop_job(job_T *job, char_u *how)
50765076
{
50775077
if (STRCMP(how, "kill") == 0)
5078-
TerminateProcess(job->jf_pi.hProcess, 0);
5078+
TerminateProcess(job->jv_pi.hProcess, 0);
50795079
else
50805080
return GenerateConsoleCtrlEvent(
50815081
STRCMP(how, "hup") == 0 ?
50825082
CTRL_BREAK_EVENT : CTRL_C_EVENT,
5083-
job->jf_pi.dwProcessId) ? OK : FAIL;
5083+
job->jv_pi.dwProcessId) ? OK : FAIL;
50845084
return OK;
50855085
}
50865086
#endif

src/structs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ struct jobvar_S
12491249
int jv_exitval;
12501250
#endif
12511251
#ifdef WIN32
1252-
PROCESS_INFORMATION jf_pi;
1252+
PROCESS_INFORMATION jv_pi;
12531253
#endif
12541254
jobstatus_T jv_status;
12551255

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1302,
750752
/**/
751753
1301,
752754
/**/

0 commit comments

Comments
 (0)