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

---
 menu.c | 1 -
 tmux.1 | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/menu.c b/menu.c
index c1f3b211..871a8eb9 100644
--- a/menu.c
+++ b/menu.c
@@ -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/tmux.1 b/tmux.1
index d369ff4c..fe31bf4a 100644
--- a/tmux.1
+++ b/tmux.1
@@ -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

From 71aa4fe7670c262ff9bd58830e2822f1f554b046 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 17 Oct 2024 17:22:01 +0000
Subject: [PATCH 2/2] Switch pane-colors and cursor-style options to be in
 alphabetical order, from Teubel Gyorgy, GitHub issue 4191.

---
 tmux.1 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tmux.1 b/tmux.1
index fe31bf4a..e9cd3c73 100644
--- a/tmux.1
+++ b/tmux.1
@@ -5161,13 +5161,6 @@ visible before the application starts reappears unchanged after it exits.
 .It Ic cursor-colour Ar colour
 Set the colour of the cursor.
 .Pp
-.It Ic pane-colours[] Ar colour
-The default colour palette.
-Each entry in the array defines the colour
-.Nm
-uses when the colour with that index is requested.
-The index may be from zero to 255.
-.Pp
 .It Ic cursor-style Ar style
 Set the style of the cursor.
 Available styles are:
@@ -5179,6 +5172,13 @@ Available styles are:
 .Ic blinking-bar ,
 .Ic bar .
 .Pp
+.It Ic pane-colours[] Ar colour
+The default colour palette.
+Each entry in the array defines the colour
+.Nm
+uses when the colour with that index is requested.
+The index may be from zero to 255.
+.Pp
 .It Xo Ic remain-on-exit
 .Op Ic on | off | failed
 .Xc