From 3979f694a53b80e5c213baea2e357f5f71441ad2 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Thu, 22 Aug 2024 09:05:51 +0000
Subject: [PATCH] Clear overlay when command prompt is entered. Also fix some
 spacing in man page pointed out by jmc.

---
 usr.bin/tmux/key-string.c |  3 +--
 usr.bin/tmux/status.c     |  4 +++-
 usr.bin/tmux/tmux.1       | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr.bin/tmux/key-string.c b/usr.bin/tmux/key-string.c
index 0c96738bb15..856c974fb5a 100644
--- a/usr.bin/tmux/key-string.c
+++ b/usr.bin/tmux/key-string.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-string.c,v 1.73 2024/08/22 05:39:55 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.74 2024/08/22 09:05:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -277,7 +277,6 @@ key_string_lookup_string(const char *string)
 		}
 		free(udp);
 		return (uc);
-
 	}
 
 	/* Check for short Ctrl key. */
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 17c7d4e69b6..ad7208ef181 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.244 2024/08/21 05:03:13 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.245 2024/08/22 09:05:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -607,6 +607,8 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
 	struct format_tree	*ft;
 	char			*tmp;
 
+	server_client_clear_overlay(c);
+
 	if (fs != NULL)
 		ft = format_create_from_state(NULL, c, fs);
 	else
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 80d137b444b..0890ffafbc1 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.950 2024/08/21 05:06:45 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.951 2024/08/22 09:05:51 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 21 2024 $
+.Dd $Mdocdate: August 22 2024 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -4491,9 +4491,9 @@ Set the character used to fill areas of the terminal unused by a window.
 .It Ic main-pane-height Ar height
 .It Ic main-pane-width Ar width
 Set the width or height of the main (left or top) pane in the
-.Ic main-horizontal,
-.Ic main-horizontal-mirrored,
-.Ic main-vertical,
+.Ic main-horizontal ,
+.Ic main-horizontal-mirrored ,
+.Ic main-vertical ,
 or
 .Ic main-vertical-mirrored
 layouts.
-- 
2.20.1