diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_channel.vim | 11 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index c98f5bd683..e1f8a5e352 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1992,15 +1992,20 @@ func Test_job_start_fails() endfunc func Test_issue_5150() - let g:job = job_start('grep foo', {}) + if has('win32') + let cmd = 'cmd /c pause' + else + let cmd = 'grep foo' + endif + let g:job = job_start(cmd, {}) call job_stop(g:job) sleep 10m call assert_equal(-1, job_info(g:job).exitval) - let g:job = job_start('grep foo', {}) + let g:job = job_start(cmd, {}) call job_stop(g:job, 'term') sleep 10m call assert_equal(-1, job_info(g:job).exitval) - let g:job = job_start('grep foo', {}) + let g:job = job_start(cmd, {}) call job_stop(g:job, 'kill') sleep 10m call assert_equal(-1, job_info(g:job).exitval) diff --git a/src/version.c b/src/version.c index 2c4cd0db39..1d81c63cc7 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 362, +/**/ 361, /**/ 360, |