summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-16 19:44:20 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-16 19:44:20 +0100
commit0c2c96e47c8b44f7d69da2add906224a89318ff7 (patch)
treebf6996ecbf476640cd569417dca2e911944dbcc8
parentba093bc0002ac60aebd0f2d8a458e2fdac38f1ed (diff)
downloadvim-git-7.4.1338.tar.gz
patch 7.4.1338v7.4.1338
Problem: Another part of the change is missing. Solution: Type os_unix.c right this time.
-rw-r--r--src/os_unix.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index ec43f8939..0059c9eee 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5037,7 +5037,7 @@ error:
#if defined(FEAT_JOB) || defined(PROTO)
void
-mch_start_job(char **argv, job_T *job)
+mch_start_job(char **argv, job_T *job, jobopt_T *options)
{
pid_t pid;
int fd_in[2]; /* for stdin */
@@ -5127,6 +5127,7 @@ mch_start_job(char **argv, job_T *job)
# ifdef FEAT_CHANNEL
channel_set_pipes(channel, fd_in[1], fd_out[0], fd_err[0]);
channel_set_job(channel, job);
+ channel_set_mode(channel, options->jo_mode);
# ifdef FEAT_GUI
channel_gui_register(channel);
# endif
diff --git a/src/version.c b/src/version.c
index 9474c42a6..a86556695 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 */
/**/
+ 1338,
+/**/
1337,
/**/
1336,