diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-09 20:39:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-09 20:39:26 +0100 |
| commit | 4d8747cdfc13843a5680dc8340fbeb6d32e7b626 (patch) | |
| tree | 735758bc606b2770cb2520f70d0ec23ba5f9e545 | |
| parent | 7280140c08799f683ef31a6c1019e283c3dc13aa (diff) | |
| download | vim-git-4d8747cdfc13843a5680dc8340fbeb6d32e7b626.tar.gz | |
patch 7.4.1295v7.4.1295
Problem: string(job) doesn't work well on MS-Windows.
Solution: Use the process ID. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 33f95ef30..8cc8d0519 100644 --- a/src/eval.c +++ b/src/eval.c @@ -21606,8 +21606,12 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf) # ifdef UNIX vim_snprintf((char *)buf, NUMBUFLEN, "process %ld %s", (long)job->jv_pid, status); +# elif defined(WIN32) + vim_snprintf((char *)buf, NUMBUFLEN, + "process %ld %s", (long)job->jf_pi.dwProcessId, + status); # else - /* TODO */ + /* fall-back */ vim_snprintf((char *)buf, NUMBUFLEN, "process ? %s", status); # endif return buf; diff --git a/src/version.c b/src/version.c index 1be6854fd..491b94a98 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 */ /**/ + 1295, +/**/ 1294, /**/ 1293, |