Skip to content

Commit 4d8747c

Browse files
committed
patch 7.4.1295
Problem: string(job) doesn't work well on MS-Windows. Solution: Use the process ID. (Yasuhiro Matsumoto)
1 parent 7280140 commit 4d8747c

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/eval.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21606,8 +21606,12 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf)
2160621606
# ifdef UNIX
2160721607
vim_snprintf((char *)buf, NUMBUFLEN,
2160821608
"process %ld %s", (long)job->jv_pid, status);
21609+
# elif defined(WIN32)
21610+
vim_snprintf((char *)buf, NUMBUFLEN,
21611+
"process %ld %s", (long)job->jf_pi.dwProcessId,
21612+
status);
2160921613
# else
21610-
/* TODO */
21614+
/* fall-back */
2161121615
vim_snprintf((char *)buf, NUMBUFLEN, "process ? %s", status);
2161221616
# endif
2161321617
return buf;

src/version.c

Lines changed: 2 additions & 0 deletions
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+
1295,
750752
/**/
751753
1294,
752754
/**/

0 commit comments

Comments
 (0)