summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-05-08 09:40:51 +0200
committerBram Moolenaar <Bram@vim.org>2016-05-08 09:40:51 +0200
commitea83bf06b92baeb6d68a10d8e8ffad289d31dae2 (patch)
tree9abc4597a8f5351d5050b28ba7fd9bef4f3ae8cf
parent4ed6b2e2d7fd5959fb9b9f608935d47305c4bbe4 (diff)
downloadvim-git-ea83bf06b92baeb6d68a10d8e8ffad289d31dae2.tar.gz
patch 7.4.1822v7.4.1822
Problem: Redirecting stdout of a channel to "null" doesn't work. (Nicola) Solution: Correct the file descriptor number.
-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 f2f2ca4c9..f7b5ae4b1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5195,7 +5195,7 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options UNUSED)
/* set up stdout for the child */
if (use_null_for_out && null_fd >= 0)
{
- close(0);
+ close(1);
ignored = dup(null_fd);
}
else
@@ -5206,6 +5206,7 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options UNUSED)
ignored = dup(fd_out[1]);
close(fd_out[1]);
}
+
if (null_fd >= 0)
close(null_fd);
diff --git a/src/version.c b/src/version.c
index 56e9a3e61..36eba983f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1822,
+/**/
1821,
/**/
1820,