Merge branch 'obsd-master' into master

job.c

@@ -87,9 +87,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);

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);

tmux.1

@@ -4992,7 +4992,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
@@ -6158,6 +6160,8 @@ Execute the first
 .Ar command
 if
 .Ar shell-command
+(run with
+.Pa /bin/sh )
 returns success or the second
 .Ar command
 otherwise.
@@ -6194,6 +6198,8 @@ option.
 .D1 Pq alias: Ic run
 Execute
 .Ar shell-command
+using
+.Pa /bin/sh
 or (with
 .Fl C )
 a