Merge branch 'obsd-master'

3 files changed, 8 insertions, 7 deletions

diff --git a/resize.c b/resize.c
index caac74ba..0e0b070d 100644
--- a/resize.c
+++ b/resize.c
@@ -174,11 +174,12 @@ recalculate_sizes(void)
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (ignore_client_size(c))
 			continue;
-		if (c->tty.sy <= status_line_size(c))
+		s = c->session;
+		if (c->tty.sy <= s->statuslines || (c->flags & CLIENT_CONTROL))
 			c->flags |= CLIENT_STATUSOFF;
 		else
 			c->flags &= ~CLIENT_STATUSOFF;
-		c->session->attached++;
+		s->attached++;
 	}
 
 	/* Walk each window and adjust the size. */
diff --git a/status.c b/status.c
index 332f8fd6..ef8cf14d 100644
--- a/status.c
+++ b/status.c
@@ -203,7 +203,7 @@ status_at_line(struct client *c)
 {
 	struct session	*s = c->session;
 
-	if (c->flags & CLIENT_STATUSOFF)
+	if (c->flags & (CLIENT_STATUSOFF|CLIENT_CONTROL))
 		return (-1);
 	if (s->statusat != 1)
 		return (s->statusat);
@@ -216,7 +216,7 @@ status_line_size(struct client *c)
 {
 	struct session	*s = c->session;
 
-	if (c->flags & CLIENT_STATUSOFF)
+	if (c->flags & (CLIENT_STATUSOFF|CLIENT_CONTROL))
 		return (0);
 	return (s->statuslines);
 }
diff --git a/tmux.1 b/tmux.1
index fda94553..b15eade3 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4468,17 +4468,17 @@ as a list of menu items separated by
 .Ql | .
 Each menu item consists of three comma-separated parts:
 .Bl -enum -width Ds
-.It name
+.It
 The menu item name.
 This is a format and may include embedded styles, see the
 .Sx FORMATS
 and
 .Sx STYLES
 sections.
-.It key
+.It
 The menu item shortcut key.
 If this is empty the menu item has no key shortcut.
-.It command
+.It
 The command run when the menu item is chosen.
 .El
 .Pp