Merge branch 'obsd-master'

1 files changed, 10 insertions, 6 deletions

diff --git a/status.c b/status.c
index 467db6ad..1a11a564 100644
--- a/status.c
+++ b/status.c
@@ -323,8 +323,8 @@ status_redraw(struct client *c)
 	u_int				 lines, i, width = c->tty.sx;
 	int				 flags, force = 0, changed = 0;
 	struct options_entry		*o;
+	union options_value		*ov;
 	struct format_tree		*ft;
-	const char			*fmt;
 	char				*expanded;
 
 	log_debug("%s enter", __func__);
@@ -370,14 +370,14 @@ status_redraw(struct client *c)
 		for (i = 0; i < lines; i++) {
 			screen_write_cursormove(&ctx, 0, i, 0);
 
-			fmt = options_array_get(o, i);
-			if (fmt == NULL) {
+			ov = options_array_get(o, i);
+			if (ov == NULL) {
 				screen_write_clearline(&ctx, gc.bg);
 				continue;
 			}
 			sle = &sl->entries[i];
 
-			expanded = format_expand_time(ft, fmt);
+			expanded = format_expand_time(ft, ov->string);
 			if (!force &&
 			    sle->expanded != NULL &&
 			    strcmp(expanded, sle->expanded) == 0) {
@@ -1293,6 +1293,7 @@ status_prompt_complete_list(u_int *size, const char *s)
 	size_t					  slen = strlen(s), valuelen;
 	struct options_entry			 *o;
 	struct options_array_item		 *a;
+	union options_value			 *ov;
 	const char				 *layouts[] = {
 		"even-horizontal", "even-vertical", "main-horizontal",
 		"main-vertical", "tiled", NULL
@@ -1321,10 +1322,13 @@ status_prompt_complete_list(u_int *size, const char *s)
 	if (o != NULL) {
 		a = options_array_first(o);
 		while (a != NULL) {
-			value = options_array_item_value(a);;
-			if (value == NULL || (cp = strchr(value, '=')) == NULL)
+			ov = options_array_item_value(a);
+			if (ov == NULL)
 				goto next;
 
+			value = ov->string;
+			if ((cp = strchr(value, '=')) == NULL)
+			    goto next;
 			valuelen = cp - value;
 			if (slen > valuelen || strncmp(value, s, slen) != 0)
 				goto next;