===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-keys.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- src/usr.bin/tmux/cmd-list-keys.c	2015/11/18 14:27:44	1.30
+++ src/usr.bin/tmux/cmd-list-keys.c	2015/11/27 15:06:43	1.31
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-list-keys.c,v 1.30 2015/11/18 14:27:44 nicm Exp $ */
+/* $OpenBSD: cmd-list-keys.c,v 1.31 2015/11/27 15:06:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -56,7 +56,6 @@
 	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 @@
 			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);
 		}