aboutsummaryrefslogtreecommitdiff
path: root/status.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-21 14:24:33 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-21 14:24:33 +0000
commit78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4 (patch)
tree293ff608c1e12ad04b811b5410beb8bd50386c49 /status.c
parent2c482939fdd92f1bd187cdcc661890dfa4e45512 (diff)
parent933929cd622478bb43afe590670613da2e9ff359 (diff)
downloadrtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.tar.gz
rtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.tar.bz2
rtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.zip
Merge branch 'obsd-master'
Conflicts: tmux.h
Diffstat (limited to 'status.c')
-rw-r--r--status.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/status.c b/status.c
index e09ac592..cbba2ead 100644
--- a/status.c
+++ b/status.c
@@ -1205,19 +1205,7 @@ status_prompt_complete_list(u_int *size, const char *s)
list[(*size)++] = (*cmdent)->name;
}
}
- for (oe = server_options_table; oe->name != NULL; oe++) {
- if (strncmp(oe->name, s, strlen(s)) == 0) {
- list = xreallocarray(list, (*size) + 1, sizeof *list);
- list[(*size)++] = oe->name;
- }
- }
- for (oe = session_options_table; oe->name != NULL; oe++) {
- if (strncmp(oe->name, s, strlen(s)) == 0) {
- list = xreallocarray(list, (*size) + 1, sizeof *list);
- list[(*size)++] = oe->name;
- }
- }
- for (oe = window_options_table; oe->name != NULL; oe++) {
+ for (oe = options_table; oe->name != NULL; oe++) {
if (strncmp(oe->name, s, strlen(s)) == 0) {
list = xreallocarray(list, (*size) + 1, sizeof *list);
list[(*size)++] = oe->name;