===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-keys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/tmux/cmd-list-keys.c	2009/07/28 17:05:10	1.7
--- src/usr.bin/tmux/cmd-list-keys.c	2009/11/05 12:04:50	1.8
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-keys.c,v 1.7 2009/07/28 17:05:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-keys.c,v 1.8 2009/11/05 12:04:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 47,53 ****
  	struct cmd_target_data	*data = self->data;
  	struct key_binding	*bd;
  	const char		*key;
! 	char			 tmp[BUFSIZ], keytmp[64];
  	int			 width, keywidth;
  
  	if (data->target != NULL)
--- 47,54 ----
  	struct cmd_target_data	*data = self->data;
  	struct key_binding	*bd;
  	const char		*key;
! 	char			 tmp[BUFSIZ];
! 	size_t			 used;
  	int			 width, keywidth;
  
  	if (data->target != NULL)
***************
*** 70,83 ****
  		key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
  		if (key == NULL)
  			continue;
  
! 		*tmp = '\0';
! 		cmd_list_print(bd->cmdlist, tmp, sizeof tmp);
! 		if (!(bd->key & KEYC_PREFIX)) {
! 			xsnprintf(keytmp, sizeof keytmp, "[%s]", key);
! 			key = keytmp;
! 		}
! 		ctx->print(ctx, "%*s: %s", width, key, tmp);
  	}
  
  	return (0);
--- 71,85 ----
  		key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
  		if (key == NULL)
  			continue;
+ 		if (!(bd->key & KEYC_PREFIX))
+ 			used = xsnprintf(tmp, sizeof tmp, "[%s]: ", key);
+ 		else
+ 			used = xsnprintf(tmp, sizeof tmp, "%*s: ", width, key);
+ 		if (used >= sizeof tmp)
+ 			continue;
  
! 		cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used);
! 		ctx->print(ctx, "%s", tmp);
  	}
  
  	return (0);