===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-keys.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/tmux/cmd-list-keys.c	2020/05/16 16:02:24	1.58
--- src/usr.bin/tmux/cmd-list-keys.c	2020/05/16 16:35:13	1.59
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-keys.c,v 1.58 2020/05/16 16:02:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-list-keys.c,v 1.59 2020/05/16 16:35:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 73,79 ****
  			bd = key_bindings_next(table, bd);
  			continue;
  		}
! 		width = utf8_cstrwidth(key_string_lookup_key(bd->key));
  		if (width > keywidth)
  			keywidth = width;
  
--- 73,79 ----
  			bd = key_bindings_next(table, bd);
  			continue;
  		}
! 		width = utf8_cstrwidth(key_string_lookup_key(bd->key, 0));
  		if (width > keywidth)
  			keywidth = width;
  
***************
*** 106,112 ****
  			continue;
  		}
  		found = 1;
! 		key = key_string_lookup_key(bd->key);
  
  		if (bd->note == NULL || *bd->note == '\0')
  			note = cmd_list_print(bd->cmdlist, 1);
--- 106,112 ----
  			continue;
  		}
  		found = 1;
! 		key = key_string_lookup_key(bd->key, 0);
  
  		if (bd->note == NULL || *bd->note == '\0')
  			note = cmd_list_print(bd->cmdlist, 1);
***************
*** 135,141 ****
  	*prefix = options_get_number(global_s_options, "prefix");
  	if (!args_has(args, 'P')) {
  		if (*prefix != KEYC_NONE)
! 			xasprintf(&s, "%s ", key_string_lookup_key(*prefix));
  		else
  			s = xstrdup("");
  	} else
--- 135,141 ----
  	*prefix = options_get_number(global_s_options, "prefix");
  	if (!args_has(args, 'P')) {
  		if (*prefix != KEYC_NONE)
! 			xasprintf(&s, "%s ", key_string_lookup_key(*prefix, 0));
  		else
  			s = xstrdup("");
  	} else
***************
*** 221,227 ****
  				bd = key_bindings_next(table, bd);
  				continue;
  			}
! 			key = args_escape(key_string_lookup_key(bd->key));
  
  			if (bd->flags & KEY_BINDING_REPEAT)
  				repeat = 1;
--- 221,227 ----
  				bd = key_bindings_next(table, bd);
  				continue;
  			}
! 			key = args_escape(key_string_lookup_key(bd->key, 0));
  
  			if (bd->flags & KEY_BINDING_REPEAT)
  				repeat = 1;
***************
*** 255,261 ****
  				continue;
  			}
  			found = 1;
! 			key = args_escape(key_string_lookup_key(bd->key));
  
  			if (!repeat)
  				r = "";
--- 255,261 ----
  				continue;
  			}
  			found = 1;
! 			key = args_escape(key_string_lookup_key(bd->key, 0));
  
  			if (!repeat)
  				r = "";