aboutsummaryrefslogtreecommitdiff
path: root/cmd-list-keys.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-12-03 14:43:33 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-12-03 14:43:33 +0000
commit4d5cab408555341b64be10bf4fbd86a4d6415749 (patch)
treeea917586411cf24716aaec28a9d2d5a2b890c176 /cmd-list-keys.c
parent3cdb2f0bb793b641ec07ef45b3fd485c2089d9e4 (diff)
parent66bad2e9798f191d34c083a9c2a9d644e8984b24 (diff)
downloadrtmux-4d5cab408555341b64be10bf4fbd86a4d6415749.tar.gz
rtmux-4d5cab408555341b64be10bf4fbd86a4d6415749.tar.bz2
rtmux-4d5cab408555341b64be10bf4fbd86a4d6415749.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-list-keys.c')
-rw-r--r--cmd-list-keys.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index 4355f24e..f0a59c0b 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -56,7 +56,6 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
struct key_binding *bd;
const char *key, *tablename, *r;
char *cp, tmp[BUFSIZ];
- size_t used;
int repeat, width, tablewidth, keywidth;
if (self->entry == &cmd_list_commands_entry)
@@ -115,11 +114,9 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
strlcat(tmp, " ", sizeof tmp);
free(cp);
- used = strlen(tmp);
- if (used < (sizeof tmp) - 1) {
- cmd_list_print(bd->cmdlist, tmp + used,
- (sizeof tmp) - used);
- }
+ cp = cmd_list_print(bd->cmdlist);
+ strlcat(tmp, cp, sizeof tmp);
+ free(cp);
cmdq_print(cmdq, "bind-key %s", tmp);
}