===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-unbind-key.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/tmux/cmd-unbind-key.c	2016/10/16 19:04:05	1.29
--- src/usr.bin/tmux/cmd-unbind-key.c	2017/01/24 21:50:22	1.30
***************
*** 1,4 ****
! /* $OpenBSD: cmd-unbind-key.c,v 1.29 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-unbind-key.c,v 1.30 2017/01/24 21:50:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 28,42 ****
  
  static enum cmd_retval	cmd_unbind_key_exec(struct cmd *, struct cmdq_item *);
  
- static enum cmd_retval	cmd_unbind_key_mode_table(struct cmd *,
- 			    struct cmdq_item *, key_code);
- 
  const struct cmd_entry cmd_unbind_key_entry = {
  	.name = "unbind-key",
  	.alias = "unbind",
  
! 	.args = { "ant:T:", 0, 1 },
! 	.usage = "[-an] [-t mode-table] [-T key-table] key",
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_unbind_key_exec
--- 28,39 ----
  
  static enum cmd_retval	cmd_unbind_key_exec(struct cmd *, struct cmdq_item *);
  
  const struct cmd_entry cmd_unbind_key_entry = {
  	.name = "unbind-key",
  	.alias = "unbind",
  
! 	.args = { "anT:", 0, 1 },
! 	.usage = "[-an] [-T key-table] key",
  
  	.flags = CMD_AFTERHOOK,
  	.exec = cmd_unbind_key_exec
***************
*** 67,75 ****
  		key = KEYC_UNKNOWN;
  	}
  
- 	if (args_has(args, 't'))
- 		return (cmd_unbind_key_mode_table(self, item, key));
- 
  	if (key == KEYC_UNKNOWN) {
  		tablename = args_get(args, 'T');
  		if (tablename == NULL) {
--- 64,69 ----
***************
*** 96,132 ****
  	else
  		tablename = "prefix";
  	key_bindings_remove(tablename, key);
- 	return (CMD_RETURN_NORMAL);
- }
- 
- static enum cmd_retval
- cmd_unbind_key_mode_table(struct cmd *self, struct cmdq_item *item,
-     key_code key)
- {
- 	struct args			*args = self->args;
- 	const char			*tablename;
- 	const struct mode_key_table	*mtab;
- 	struct mode_key_binding		*mbind, mtmp;
- 
- 	tablename = args_get(args, 't');
- 	if ((mtab = mode_key_findtable(tablename)) == NULL) {
- 		cmdq_error(item, "unknown key table: %s", tablename);
- 		return (CMD_RETURN_ERROR);
- 	}
- 
- 	if (key == KEYC_UNKNOWN) {
- 		while (!RB_EMPTY(mtab->tree)) {
- 			mbind = RB_ROOT(mtab->tree);
- 			RB_REMOVE(mode_key_tree, mtab->tree, mbind);
- 			free(mbind);
- 		}
- 		return (CMD_RETURN_NORMAL);
- 	}
- 
- 	mtmp.key = key;
- 	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
- 		RB_REMOVE(mode_key_tree, mtab->tree, mbind);
- 		free(mbind);
- 	}
  	return (CMD_RETURN_NORMAL);
  }
--- 90,94 ----