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 1e82246ef9a8b958105900281d62170b831fc4bf..10f57e8b10333baa2befbf13f4e64c9d09faca42 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -21622,7 +21622,7 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf)
                            "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 4917a7f53fe861ed8eb99da3ff82a1e91f8c8ac8..5841d135d02bbd51ccbe65c1d0e0bfd96894f03e 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5050,7 +5050,7 @@ mch_start_job(char *cmd, job_T *job)
        job->jv_status = JOB_FAILED;
     else
     {
-       job->jf_pi = pi;
+       job->jv_pi = pi;
        job->jv_status = JOB_STARTED;
     }
 }
@@ -5060,12 +5060,12 @@ mch_job_status(job_T *job)
 {
     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_job_status(job_T *job)
 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 d0823bc5e88bc6f70c61cb396c8c84d1246e78c7..1ce98d025242ac65f056547c5e9b469a9dbee31e 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1249,7 +1249,7 @@ struct jobvar_S
     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 36225331ee4afcb2bffb719fd79a9bd3058674be..e3f432e57c2f1db05cb154b6a240de8ae55afde3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1302,
 /**/
     1301,
 /**/