circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-13 23:08:49 +00:00
Code Issues Projects Releases Wiki Activity

Somehow missed these bits in last commit.

Browse Source
This commit is contained in:
nicm 2019-04-23 20:40:03 +00:00
parent 772b3b7a06
commit b9022e33ea
2 changed files with 11 additions and 6 deletions

8
status.c
View File

@ -1293,6 +1293,7 @@ status_prompt_complete_list(u_int *size, const char *s)
size_t slen = strlen(s), valuelen; size_t slen = strlen(s), valuelen;
struct options_entry *o; struct options_entry *o;
struct options_array_item *a; struct options_array_item *a;
union options_value *ov;
const char *layouts[] = { const char *layouts[] = {
"even-horizontal", "even-vertical", "main-horizontal", "even-horizontal", "even-vertical", "main-horizontal",
"main-vertical", "tiled", NULL "main-vertical", "tiled", NULL
@ -1321,10 +1322,13 @@ status_prompt_complete_list(u_int *size, const char *s)
if (o != NULL) { if (o != NULL) {
a = options_array_first(o); a = options_array_first(o);
while (a != NULL) { while (a != NULL) {
value = options_array_item_value(a);; ov = options_array_item_value(a);
if (value == NULL || (cp = strchr(value, '=')) == NULL) if (ov == NULL)
goto next; goto next;
value = ov->string;
if ((cp = strchr(value, '=')) == NULL)
goto next;
valuelen = cp - value; valuelen = cp - value;
if (slen > valuelen || strncmp(value, s, slen) != 0) if (slen > valuelen || strncmp(value, s, slen) != 0)
goto next; goto next;

9
tty-keys.c
View File

@ -399,9 +399,10 @@ tty_keys_build(struct tty *tty)
const struct tty_default_key_raw *tdkr; const struct tty_default_key_raw *tdkr;
const struct tty_default_key_code *tdkc; const struct tty_default_key_code *tdkc;
u_int i; u_int i;
const char *s, *value; const char *s;
struct options_entry *o; struct options_entry *o;
struct options_array_item *a; struct options_array_item *a;
union options_value *ov;
if (tty->key_tree != NULL) if (tty->key_tree != NULL)
tty_keys_free(tty); tty_keys_free(tty);
@ -427,9 +428,9 @@ tty_keys_build(struct tty *tty)
if (o != NULL) { if (o != NULL) {
a = options_array_first(o); a = options_array_first(o);
while (a != NULL) { while (a != NULL) {
value = options_array_item_value(a); ov = options_array_item_value(a);
if (value != NULL) if (ov != NULL)
tty_keys_add(tty, value, KEYC_USER + i); tty_keys_add(tty, ov->string, KEYC_USER + i);
a = options_array_next(a); a = options_array_next(a);
} }
} }