From 770d28b8c517fd87621ea3e8d6d7bdc4f35b3a94 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Feb 2022 11:52:08 +0000
Subject: [PATCH 1/2] Do not overflow width when not enough space.

---
 menu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/menu.c b/menu.c
index aaa1287e..c770cd7d 100644
--- a/menu.c
+++ b/menu.c
@@ -81,6 +81,8 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
 		menu->count--;
 		return;
 	}
+	if (c->tty.sx <= 4)
+		return;
 	max_width = c->tty.sx - 4;
 
 	slen = strlen(s);

From 7a4ba6d4a5458f4e2450024d72f0e16905dd5c64 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Feb 2022 12:05:42 +0000
Subject: [PATCH 2/2] Mention that if-shell and #() use /bin/sh.

---
 job.c  | 3 +--
 tmux.1 | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/job.c b/job.c
index dad211f4..fb33c0cf 100644
--- a/job.c
+++ b/job.c
@@ -89,9 +89,8 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e, struct sessio
 	 * if-shell to decide on default-terminal based on outside TERM.
 	 */
 	env = environ_for_session(s, !cfg_finished);
-	if (e != NULL) {
+	if (e != NULL)
 		environ_copy(e, env);
-	}
 
 	sigfillset(&set);
 	sigprocmask(SIG_BLOCK, &set, &oldset);
diff --git a/tmux.1 b/tmux.1
index 708f5c75..5310b97f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4989,7 +4989,9 @@ commands to finish; instead, the previous result from running the same command i
 or a placeholder if the command has not been run before.
 If the command hasn't exited, the most recent line of output will be used, but the status
 line will not be updated more than once a second.
-Commands are executed with the
+Commands are executed using
+.Pa /bin/sh
+and with the
 .Nm
 global environment set (see the
 .Sx GLOBAL AND SESSION ENVIRONMENT
@@ -6155,6 +6157,8 @@ Execute the first
 .Ar command
 if
 .Ar shell-command
+(run with
+.Pa /bin/sh )
 returns success or the second
 .Ar command
 otherwise.
@@ -6191,6 +6195,8 @@ option.
 .D1 Pq alias: Ic run
 Execute
 .Ar shell-command
+using
+.Pa /bin/sh
 or (with
 .Fl C )
 a