diff src/os_unix.c @ 13898:ea0e6c71ba51 v8.0.1820

patch 8.0.1820: terminal window redirecting stdout does not show stderr commit https://github.com/vim/vim/commit/cd8fb449d6486a1a5a09c8c098ea3a38c19e8dc5 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 12 17:42:42 2018 +0200 patch 8.0.1820: terminal window redirecting stdout does not show stderr Problem: Terminal window redirecting stdout does not show stderr. (Mat?o Zanibelli) Solution: When stdout is not connected to pty_master_fd then use it for stderr. (closes #2903)
author Christian Brabandt <cb@256bit.org>
date Sat, 12 May 2018 17:45:05 +0200
parents fa0dcdaec6a3
children f39150ec146e
line wrap: on
line diff
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5645,7 +5645,12 @@ mch_job_start(char **argv, job_T *job, j
 	/* When using pty_master_fd only set it for stdout, do not duplicate it
 	 * for stderr, it only needs to be read once. */
 	int err_fd = use_out_for_err || use_file_for_err || use_null_for_err
-		      ? INVALID_FD : fd_err[0] < 0 ? INVALID_FD : fd_err[0];
+		      ? INVALID_FD
+		      : fd_err[0] >= 0
+		         ? fd_err[0]
+		         : (out_fd == pty_master_fd
+				 ? INVALID_FD
+				 : pty_master_fd);
 
 	channel_set_pipes(channel, in_fd, out_fd, err_fd);
 	channel_set_job(channel, job, options);