From 9cc603cbad33878dc0d988d3266a1589e74d7303 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 1 Jan 2020 21:51:33 +0000
Subject: [PATCH 1/2] Fix format expansion in window names, reported by Suraj N
 Kurapati.

---
 spawn.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spawn.c b/spawn.c
index 6cf7c73b..75995221 100644
--- a/spawn.c
+++ b/spawn.c
@@ -80,6 +80,8 @@ spawn_log(const char *from, struct spawn_context *sc)
 struct winlink *
 spawn_window(struct spawn_context *sc, char **cause)
 {
+	struct cmdq_item	*item = sc->item;
+	struct client		*c = item->client;
 	struct session		*s = sc->s;
 	struct window		*w;
 	struct window_pane	*wp;
@@ -182,7 +184,8 @@ spawn_window(struct spawn_context *sc, char **cause)
 	/* Set the name of the new window. */
 	if (~sc->flags & SPAWN_RESPAWN) {
 		if (sc->name != NULL) {
-			w->name = xstrdup(sc->name);
+			w->name = format_single(item, sc->name, c, s, NULL,
+			    NULL);
 			options_set_number(w->options, "automatic-rename", 0);
 		} else
 			w->name = xstrdup(default_window_name(w));

From ac85a3e0d37bc75a9ca0416898636a544af8eeb4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 1 Jan 2020 22:12:05 +0000
Subject: [PATCH 2/2] Document client exit messages.

---
 tmux.1 | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/tmux.1 b/tmux.1
index ef288e5a..1e8c13af 100644
--- a/tmux.1
+++ b/tmux.1
@@ -933,7 +933,9 @@ If
 is specified, any other clients attached to the session are detached.
 If
 .Fl x
-is given, send SIGHUP to the parent process of the client as well as
+is given, send
+.Dv SIGHUP
+to the parent process of the client as well as
 detaching the client, typically causing it to exit.
 .Fl r
 signifies the client is read-only (only keys bound to the
@@ -984,7 +986,9 @@ option kills all but the client given with
 .Fl t .
 If
 .Fl P
-is given, send SIGHUP to the parent process of the client, typically causing it
+is given, send
+.Dv SIGHUP
+to the parent process of the client, typically causing it
 to exit.
 With
 .Fl E ,
@@ -5148,6 +5152,37 @@ channel are made to wait until the channel is unlocked with
 .Ic wait-for
 .Fl U .
 .El
+.Sh EXIT MESSAGES
+When a
+.Nm
+client detaches, it prints a message.
+This may be one of:
+.Bl -tag -width Ds
+.It [detached (from session ...)]
+The client was detached normally.
+.It [detached and SIGHUP]
+The client was detached and its parent sent the
+.Dv SIGHUP
+signal (for example with
+.Ic detach-client
+.Fl P ) .
+.It [lost tty]
+The client's
+.Xr tty 4
+or
+.Xr pty 4
+was unexpectedly destroyed.
+.It [terminated]
+The client was killed with
+.Dv SIGTERM .
+.It [exited]
+The server exited when it had no sessions.
+.It [server exited]
+The server exited when it received
+.Dv SIGTERM .
+.It [server exited unexpectedly]
+The server crashed or otherwise exited without telling the client the reason.
+.El
 .Sh TERMINFO EXTENSIONS
 .Nm
 understands some unofficial extensions to