aboutsummaryrefslogtreecommitdiff
path: root/key-bindings.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-05-23 13:02:27 +0100
committerThomas Adam <thomas@xteddy.org>2019-05-23 13:02:27 +0100
commit75aeb733f292639f8332df11315ca8280e5631fd (patch)
treed459b4c2381ca737009613577deafe14196eceef /key-bindings.c
parent7ca2e2fe88cd282d3e8faea3f2000ad15972f71d (diff)
parent723010ba72e337832402f8e44981c02caa30b476 (diff)
downloadrtmux-75aeb733f292639f8332df11315ca8280e5631fd.tar.gz
rtmux-75aeb733f292639f8332df11315ca8280e5631fd.tar.bz2
rtmux-75aeb733f292639f8332df11315ca8280e5631fd.zip
Merge branch 'obsd-master'
Diffstat (limited to 'key-bindings.c')
-rw-r--r--key-bindings.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/key-bindings.c b/key-bindings.c
index c4874b50..2bc659aa 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -433,16 +433,15 @@ key_bindings_init(void)
"bind -Tcopy-mode-vi C-Up send -X scroll-up",
"bind -Tcopy-mode-vi C-Down send -X scroll-down",
};
- u_int i;
- struct cmd_list *cmdlist;
- char *cause;
+ u_int i;
+ struct cmd_parse_result *pr;
for (i = 0; i < nitems(defaults); i++) {
- cmdlist = cmd_string_parse(defaults[i], "<default>", i, &cause);
- if (cmdlist == NULL)
+ pr = cmd_parse_from_string(defaults[i], NULL);
+ if (pr->status != CMD_PARSE_SUCCESS)
fatalx("bad default key: %s", defaults[i]);
- cmdq_append(NULL, cmdq_get_command(cmdlist, NULL, NULL, 0));
- cmd_list_free(cmdlist);
+ cmdq_append(NULL, cmdq_get_command(pr->cmdlist, NULL, NULL, 0));
+ cmd_list_free(pr->cmdlist);
}
}