From 40e65c511502fe47932e230290537e7391ab8a83 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 27 Jul 2020 08:03:10 +0000
Subject: Add a -d option to display-message to set delay, from theonekeyg at
 gmail dot com in GitHub issue 2322.

---
 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 ecafc776..c8606245 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -1003,7 +1003,7 @@ window_customize_set_option_callback(struct client *c, void *itemdata,
 
 fail:
 	*cause = toupper((u_char)*cause);
-	status_message_set(c, 1, "%s", cause);
+	status_message_set(c, -1, 1, "%s", cause);
 	free(cause);
 	return (0);
 }
@@ -1209,7 +1209,7 @@ window_customize_set_command_callback(struct client *c, void *itemdata,
 
 fail:
 	*error = toupper((u_char)*error);
-	status_message_set(c, 1, "%s", error);
+	status_message_set(c, -1, 1, "%s", error);
 	free(error);
 	return (0);
 }
-- 
cgit 


From ed946dccc76f87064f1b8299b6ea332db9ab6c19 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 18 Sep 2020 11:20:59 +0000
Subject: Some other warnings, GitHub issue 2382.

---
 window-customize.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'window-customize.c')

diff --git a/window-customize.c b/window-customize.c
index c8606245..1dad07cd 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -380,7 +380,7 @@ window_customize_build_options(struct window_customize_modedata *data,
     struct format_tree *ft, const char *filter, struct cmd_find_state *fs)
 {
 	struct mode_tree_item		 *top;
-	struct options_entry		 *o, *loop;
+	struct options_entry		 *o = NULL, *loop;
 	const char			**list = NULL, *name;
 	u_int				  size = 0, i;
 	enum window_customize_scope	  scope;
@@ -1018,7 +1018,7 @@ window_customize_set_option(struct client *c,
 	struct options				*oo;
 	struct window_customize_itemdata	*new_item;
 	int					 flag, idx = item->idx;
-	enum window_customize_scope		 scope;
+	enum window_customize_scope		 scope = WINDOW_CUSTOMIZE_NONE;
 	u_int					 choice;
 	const char				*name = item->name, *space = "";
 	char					*prompt, *value, *text;
@@ -1031,7 +1031,7 @@ window_customize_set_option(struct client *c,
 		return;
 
 	oe = options_table_entry(o);
-	if (~oe->scope & OPTIONS_TABLE_PANE)
+	if (oe != NULL && ~oe->scope & OPTIONS_TABLE_PANE)
 		pane = 0;
 	if (oe != NULL && (oe->flags & OPTIONS_TABLE_IS_ARRAY)) {
 		scope = item->scope;
-- 
cgit