From 650d38962f180d0fe547ebb79aad433b27c1dde9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 24 Apr 2020 09:57:49 +0100 Subject: [PATCH 1/3] tmux 3.1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9675660c..25d3881c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.1-rc4) +AC_INIT([tmux], 3.1) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) From 646bfe403e638f2a005ddfba37da0f94805d7e11 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 27 Apr 2020 09:36:30 +0100 Subject: [PATCH 2/3] Do not close stdout file descriptor in control mode since it will be needed for printing the exit messages. --- client.c | 5 +++-- configure.ac | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client.c b/client.c index 91e084a5..f247d059 100644 --- a/client.c +++ b/client.c @@ -523,7 +523,7 @@ client_write_open(void *data, size_t datalen) errno = EBADF; else { cf->fd = dup(msg->fd); - if (client_flags & CLIENT_CONTROL) + if (~client_flags & CLIENT_CONTROL) close(msg->fd); /* can only be used once */ } } @@ -678,7 +678,8 @@ client_read_open(void *data, size_t datalen) errno = EBADF; else { cf->fd = dup(msg->fd); - close(msg->fd); /* can only be used once */ + if (~client_flags & CLIENT_CONTROL) + close(msg->fd); /* can only be used once */ } } if (cf->fd == -1) { diff --git a/configure.ac b/configure.ac index 25d3881c..6a9ba594 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.1) +AC_INIT([tmux], 3.1a) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) From d0fa5207889ee9ee4db45ac3684c882109f91e5b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 27 Apr 2020 09:38:04 +0100 Subject: [PATCH 3/3] Update CHANGES. --- CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index ec373fa3..12d6aac1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +CHANGES FROM 3.1 TO 3.1a + +* Do not close stdout prematurely in control mode since it is needed to print + exit messages. Prevents hanging when detaching with iTerm2. + CHANGES FROM 3.0a TO 3.1 * Only search the visible part of the history when marking (highlighting)