From 820df0f551adc056024ed1d927b31c72bcde262d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 3 Dec 2025 07:38:46 +0000
Subject: [PATCH 1/2] Add check that the pane is not in alternate screen mode
 when in copy-mode. From Michael Grant in GitHub issue 4728.

---
 window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/window.c b/window.c
index 16f1ecb3..80bc57c2 100644
--- a/window.c
+++ b/window.c
@@ -1769,7 +1769,7 @@ window_pane_mode(struct window_pane *wp)
 int
 window_pane_show_scrollbar(struct window_pane *wp, int sb_option)
 {
-	if (SCREEN_IS_ALTERNATE(wp->screen))
+	if (SCREEN_IS_ALTERNATE(&wp->base))
 		return (0);
 	if (sb_option == PANE_SCROLLBARS_ALWAYS ||
 	    (sb_option == PANE_SCROLLBARS_MODAL &&

From a28dbe3a599ef9baa3878bbb734489f3e352349e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 3 Dec 2025 07:41:38 +0000
Subject: [PATCH 2/2] Improve code readability in colour_palette_get and
 colour_palette_set. GitHub issue 4730 from Pavel Roskin.

---
 colour.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/colour.c b/colour.c
index 791c5fd5..88198e96 100644
--- a/colour.c
+++ b/colour.c
@@ -1082,22 +1082,22 @@ colour_palette_free(struct colour_palette *p)
 
 /* Get a colour from a palette. */
 int
-colour_palette_get(struct colour_palette *p, int c)
+colour_palette_get(struct colour_palette *p, int n)
 {
 	if (p == NULL)
 		return (-1);
 
-	if (c >= 90 && c <= 97)
-		c = 8 + c - 90;
-	else if (c & COLOUR_FLAG_256)
-		c &= ~COLOUR_FLAG_256;
-	else if (c >= 8)
+	if (n >= 90 && n <= 97)
+		n = 8 + n - 90;
+	else if (n & COLOUR_FLAG_256)
+		n &= ~COLOUR_FLAG_256;
+	else if (n >= 8)
 		return (-1);
 
-	if (p->palette != NULL && p->palette[c] != -1)
-		return (p->palette[c]);
-	if (p->default_palette != NULL && p->default_palette[c] != -1)
-		return (p->default_palette[c]);
+	if (p->palette != NULL && p->palette[n] != -1)
+		return (p->palette[n]);
+	if (p->default_palette != NULL && p->default_palette[n] != -1)
+		return (p->default_palette[n]);
 	return (-1);
 }
 
@@ -1107,15 +1107,14 @@ colour_palette_set(struct colour_palette *p, int n, int c)
 {
 	u_int	i;
 
-	if (p == NULL || n > 255)
+	if (p == NULL || n < 0 || n > 255)
 		return (0);
 
 	if (c == -1 && p->palette == NULL)
 		return (0);
 
-	if (c != -1 && p->palette == NULL) {
-		if (p->palette == NULL)
-			p->palette = xcalloc(256, sizeof *p->palette);
+	if (p->palette == NULL) {
+		p->palette = xcalloc(256, sizeof *p->palette);
 		for (i = 0; i < 256; i++)
 			p->palette[i] = -1;
 	}