From f3288aa0cc28680eacfc061c81b7a773bdca40f2 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Thu, 17 Oct 2024 17:10:41 +0000
Subject: [PATCH] Allow attributes in menu style, from Japin Li in GitHub issue
 4194.

---
 usr.bin/tmux/menu.c | 3 +--
 usr.bin/tmux/tmux.1 | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/usr.bin/tmux/menu.c b/usr.bin/tmux/menu.c
index 10ad6646937..d16e38144ca 100644
--- a/usr.bin/tmux/menu.c
+++ b/usr.bin/tmux/menu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: menu.c,v 1.53 2024/08/21 04:17:09 nicm Exp $ */
+/* $OpenBSD: menu.c,v 1.54 2024/10/17 17:10:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -453,7 +453,6 @@ menu_set_style(struct client *c, struct grid_cell *gc, const char *style,
 			gc->bg = sytmp.gc.bg;
 		}
 	}
-	gc->attr = 0;
 }
 
 struct menu_data *
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 99e4f031119..eb3d66eaa9b 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.965 2024/10/10 10:41:33 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.966 2024/10/17 17:10:41 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: October 10 2024 $
+.Dd $Mdocdate: October 17 2024 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -4476,21 +4476,18 @@ See the
 .Sx STYLES
 section on how to specify
 .Ar style .
-Attributes are ignored.
 .It Ic menu-selected-style Ar style
 Set the selected menu item style.
 See the
 .Sx STYLES
 section on how to specify
 .Ar style .
-Attributes are ignored.
 .It Ic menu-border-style Ar style
 Set the menu border style.
 See the
 .Sx STYLES
 section on how to specify
 .Ar style .
-Attributes are ignored.
 .It Ic menu-border-lines Ar type
 Set the type of characters used for drawing menu borders.
 See
-- 
2.20.1