patch 7.4.1295

Problem:    string(job) doesn't work well on MS-Windows.
Solution:   Use the process ID. (Yasuhiro Matsumoto)

diff --git a/src/eval.c b/src/eval.c
index 33f95ef30b0b0c1707cebd7ef19500a7f2419f43..8cc8d0519eb499cd720a3135871641fec1e7c8b8 100644 (file)
--- 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 1be6854fdca8e5e31d95bfe7a54fd308d37de7af..491b94a98ce0cfdc214359fc76a650cf5e27f523 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 */
+/**/
+    1295,
 /**/
     1294,
 /**/