From cc27a43c402b412509f4bd63ecf4c263ea65ec81 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 18 Oct 2021 09:09:46 +0000
Subject: [PATCH 1/3] Remove duplicate options, spotted by Ricky Cintron.

---
 tmux.1 | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tmux.1 b/tmux.1
index cb930c9c..ab92be2e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4276,24 +4276,6 @@ see the
 section.
 Attributes are ignored.
 .Pp
-.It Ic popup-style Ar style
-Set the popup style.
-For how to specify
-.Ar style ,
-see the
-.Sx STYLES
-section.
-Attributes are ignored.
-.Pp
-.It Ic popup-border-style Ar style
-Set the popup border style.
-For how to specify
-.Ar style ,
-see the
-.Sx STYLES
-section.
-Attributes are ignored.
-.Pp
 .It Ic popup-border-lines Ar type
 Set the type of characters used for drawing popup borders.
 .Ar type

From 2c188ee0c5dbe2633920b0c2a341264335734767 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 18 Oct 2021 09:15:56 +0000
Subject: [PATCH 2/3] Spacing fixes from Alexis Hildebrandt.

---
 tty-acs.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tty-acs.c b/tty-acs.c
index 1a57826c..64ba367e 100644
--- a/tty-acs.c
+++ b/tty-acs.c
@@ -25,7 +25,7 @@
 
 /* Table mapping ACS entries to UTF-8. */
 struct tty_acs_entry {
-	u_char	 	 key;
+	u_char		 key;
 	const char	*string;
 };
 static const struct tty_acs_entry tty_acs_table[] = {
@@ -61,7 +61,7 @@ static const struct tty_acs_entry tty_acs_table[] = {
 	{ 'x', "\342\224\202" },	/* vertical line */
 	{ 'y', "\342\211\244" },	/* less-than-or-equal-to */
 	{ 'z', "\342\211\245" },	/* greater-than-or-equal-to */
-	{ '{', "\317\200" },   		/* greek pi */
+	{ '{', "\317\200" },		/* greek pi */
 	{ '|', "\342\211\240" },	/* not-equal */
 	{ '}', "\302\243" },		/* UK pound sign */
 	{ '~', "\302\267" }		/* bullet */
@@ -124,7 +124,7 @@ static const struct utf8_data tty_acs_double_borders_list[] = {
 	{ "\342\225\240", 0, 3, 1 }, /* U+2560 */
 	{ "\342\225\243", 0, 3, 1 }, /* U+2563 */
 	{ "\342\225\254", 0, 3, 1 }, /* U+256C */
-	{ "\302\267",     0, 2, 1 }  /* U+00B7 */
+	{ "\302\267",	  0, 2, 1 }  /* U+00B7 */
 };
 
 /* UTF-8 heavy borders. */
@@ -141,24 +141,24 @@ static const struct utf8_data tty_acs_heavy_borders_list[] = {
 	{ "\342\224\243", 0, 3, 1 }, /* U+2523 */
 	{ "\342\224\253", 0, 3, 1 }, /* U+252B */
 	{ "\342\225\213", 0, 3, 1 }, /* U+254B */
-	{ "\302\267",     0, 2, 1 }  /* U+00B7 */
+	{ "\302\267",	  0, 2, 1 }  /* U+00B7 */
 };
 
 /* UTF-8 rounded borders. */
 static const struct utf8_data tty_acs_rounded_borders_list[] = {
-       { "", 0, 0, 0 },
-       { "\342\224\202", 0, 3, 1 }, /* U+2502 */
-       { "\342\224\200", 0, 3, 1 }, /* U+2500 */
-       { "\342\225\255", 0, 3, 1 }, /* U+256D */
-       { "\342\225\256", 0, 3, 1 }, /* U+256E */
-       { "\342\225\260", 0, 3, 1 }, /* U+2570 */
-       { "\342\225\257", 0, 3, 1 }, /* U+256F */
-       { "\342\224\263", 0, 3, 1 }, /* U+2533 */
-       { "\342\224\273", 0, 3, 1 }, /* U+253B */
-       { "\342\224\243", 0, 3, 1 }, /* U+2523 */
-       { "\342\224\253", 0, 3, 1 }, /* U+252B */
-       { "\342\225\213", 0, 3, 1 }, /* U+254B */
-       { "\302\267",     0, 2, 1 }  /* U+00B7 */
+	{ "", 0, 0, 0 },
+	{ "\342\224\202", 0, 3, 1 }, /* U+2502 */
+	{ "\342\224\200", 0, 3, 1 }, /* U+2500 */
+	{ "\342\225\255", 0, 3, 1 }, /* U+256D */
+	{ "\342\225\256", 0, 3, 1 }, /* U+256E */
+	{ "\342\225\260", 0, 3, 1 }, /* U+2570 */
+	{ "\342\225\257", 0, 3, 1 }, /* U+256F */
+	{ "\342\224\263", 0, 3, 1 }, /* U+2533 */
+	{ "\342\224\273", 0, 3, 1 }, /* U+253B */
+	{ "\342\224\243", 0, 3, 1 }, /* U+2523 */
+	{ "\342\224\253", 0, 3, 1 }, /* U+252B */
+	{ "\342\225\213", 0, 3, 1 }, /* U+254B */
+	{ "\302\267",	  0, 2, 1 }  /* U+00B7 */
 };
 
 /* Get cell border character for double style. */

From 51ff77d47be80d59b1e30e55bd75788fcc22e4bf Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 18 Oct 2021 09:48:35 +0000
Subject: [PATCH 3/3] Fix menu width containing disabled items, from Alexis
 Hildebrandt in GitHub issue 2935.

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

diff --git a/menu.c b/menu.c
index 4c6403a0..a1c81816 100644
--- a/menu.c
+++ b/menu.c
@@ -100,6 +100,8 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
 	new_item->key = item->key;
 
 	width = format_width(new_item->name);
+	if (*new_item->name == '-')
+		width--;
 	if (width > menu->width)
 		menu->width = width;
 }