diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-11 12:48:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-11 12:48:36 +0100 |
| commit | 6119e6156e024d9047bbfeb7cdfdae259f9e1b92 (patch) | |
| tree | f47e368895af444b12ae03b7b2f1ce38d008f090 | |
| parent | 39b21272d521512b6ecac6cc0f310944f21b7443 (diff) | |
| download | vim-git-6119e6156e024d9047bbfeb7cdfdae259f9e1b92.tar.gz | |
patch 7.4.1302v7.4.1302
Problem: Typo in struct field name. (Ken Takata)
Solution: Rename jf_pi to jv_pi.
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/os_win32.c | 12 | ||||
| -rw-r--r-- | src/structs.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c index 1e82246ef..10f57e8b1 100644 --- 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 4917a7f53..5841d135d 100644 --- 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 d0823bc5e..1ce98d025 100644 --- 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 36225331e..e3f432e57 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 */ /**/ + 1302, +/**/ 1301, /**/ 1300, |