aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-11-01 10:01:13 +0000
committerThomas Adam <thomas@xteddy.org>2021-11-01 10:01:13 +0000
commit774903f6c4b1c1ae44517af43a7d70d80eb7d805 (patch)
treeffb9544d0a82f0612dc178d4e31d887eedf02e67
parentc76904343a3ddfea3c58ec00d9904c16574a8af3 (diff)
parent4fe5aa99fb203ddb25089955d8814e1065e11a60 (diff)
downloadrtmux-774903f6c4b1c1ae44517af43a7d70d80eb7d805.tar.gz
rtmux-774903f6c4b1c1ae44517af43a7d70d80eb7d805.tar.bz2
rtmux-774903f6c4b1c1ae44517af43a7d70d80eb7d805.zip
Merge branch 'obsd-master' into master
-rw-r--r--colour.c2
-rw-r--r--status.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/colour.c b/colour.c
index 92bbd71e..6ede25da 100644
--- a/colour.c
+++ b/colour.c
@@ -115,7 +115,7 @@ colour_force_rgb(int c)
return (colour_256toRGB(c));
if (c >= 0 && c <= 7)
return (colour_256toRGB(c));
- if (c >= 90 & c <= 97)
+ if (c >= 90 && c <= 97)
return (colour_256toRGB(8 + c - 90));
return (-1);
}
diff --git a/status.c b/status.c
index 65c81386..d499eab8 100644
--- a/status.c
+++ b/status.c
@@ -1727,7 +1727,7 @@ status_prompt_complete_list_menu(struct client *c, char **list, u_int size,
item.name = list[i];
item.key = '0' + (i - spm->start);
item.command = NULL;
- menu_add_item(menu, &item, NULL, NULL, NULL);
+ menu_add_item(menu, &item, NULL, c, NULL);
}
if (options_get_number(c->session->options, "status-position") == 0)