summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-11 22:22:36 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-11 22:22:36 +0200
commit8ed54007399f968aab447ae6cb46623b1bdbc75e (patch)
treefa6bb197209781e2013a87228f10632488caf710
parent08d384ff3aa0366c18fb87ed215b1b4bdf9b1745 (diff)
downloadvim-8ed54007399f968aab447ae6cb46623b1bdbc75e.zip
patch 8.0.0909: channel test fails
Problem: Channel test fails. Solution: Allow for "cwd" and "env" arguments.
-rw-r--r--src/channel.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c
index b220f7166..58b0b0c9a 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4976,8 +4976,9 @@ job_start(typval_T *argvars, jobopt_T *opt_arg)
clear_job_options(&opt);
opt.jo_mode = MODE_NL;
if (get_job_options(&argvars[1], &opt,
- JO_MODE_ALL + JO_CB_ALL + JO_TIMEOUT_ALL + JO_STOPONEXIT
- + JO_EXIT_CB + JO_OUT_IO + JO_BLOCK_WRITE, 0) == FAIL)
+ JO_MODE_ALL + JO_CB_ALL + JO_TIMEOUT_ALL + JO_STOPONEXIT
+ + JO_EXIT_CB + JO_OUT_IO + JO_BLOCK_WRITE,
+ JO2_ENV + JO2_CWD) == FAIL)
goto theend;
}
diff --git a/src/version.c b/src/version.c
index acc855c87..741c4a235 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 909,
+/**/
908,
/**/
907,