From add03dfb8dd4f2871b2cbc487ff5af95a63f48f4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 29 Nov 2021 11:01:51 +0000
Subject: Fix user option lookup ordering.

---
 window-customize.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'window-customize.c')

diff --git a/window-customize.c b/window-customize.c
index 0f09eba8..98387e50 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -398,11 +398,11 @@ window_customize_build_options(struct window_customize_modedata *data,
 
 	for (i = 0; i < size; i++) {
 		if (oo2 != NULL)
-			o = options_get(oo0, list[i]);
+			o = options_get(oo2, list[i]);
 		if (o == NULL && oo1 != NULL)
 			o = options_get(oo1, list[i]);
 		if (o == NULL)
-			o = options_get(oo2, list[i]);
+			o = options_get(oo0, list[i]);
 		if (options_owner(o) == oo2)
 			scope = scope2;
 		else if (options_owner(o) == oo1)
-- 
cgit 


From 938130bc6925808681cbc003a392ccce2a4455c1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 24 Mar 2022 12:07:25 +0000
Subject: Add unit (milliseconds) to escape-time, show unset colours as "none"
 rather than "invalid" and don't show the same text twice for user options in
 customize mode.

---
 window-customize.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'window-customize.c')

diff --git a/window-customize.c b/window-customize.c
index 98387e50..4a16e90c 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -680,9 +680,7 @@ window_customize_draw_option(struct window_customize_modedata *data,
 	}
 	ft = format_create_from_state(NULL, NULL, &fs);
 
-	if (oe == NULL)
-		text = "This is a user option.";
-	else if (oe->text == NULL)
+	if (oe == NULL || oe->text == NULL)
 		text = "This option doesn't have a description.";
 	else
 		text = oe->text;
-- 
cgit