===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-bind-key.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** src/usr.bin/tmux/cmd-bind-key.c	2016/10/10 21:51:39	1.27
--- src/usr.bin/tmux/cmd-bind-key.c	2016/10/11 07:23:34	1.28
***************
*** 1,4 ****
! /* $OpenBSD: cmd-bind-key.c,v 1.27 2016/10/10 21:51:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-bind-key.c,v 1.28 2016/10/11 07:23:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 36,43 ****
  	.name = "bind-key",
  	.alias = "bind",
  
! 	.args = { "cnrR:t:T:", 1, -1 },
! 	.usage = "[-cnr] [-t mode-table] [-R repeat-count] [-T key-table] key "
  	         "command [arguments]",
  
  	.flags = 0,
--- 36,43 ----
  	.name = "bind-key",
  	.alias = "bind",
  
! 	.args = { "cnrt:T:", 1, -1 },
! 	.usage = "[-cnr] [-t mode-table] [-T key-table] key "
  	         "command [arguments]",
  
  	.flags = 0,
***************
*** 97,108 ****
  cmd_bind_key_mode_table(struct cmd *self, struct cmd_q *cmdq, key_code key)
  {
  	struct args			*args = self->args;
! 	const char			*tablename, *arg;
  	const struct mode_key_table	*mtab;
  	struct mode_key_binding		*mbind, mtmp;
  	enum mode_key_cmd		 cmd;
- 	char				*cause;
- 	u_int				 repeat;
  
  	tablename = args_get(args, 't');
  	if ((mtab = mode_key_findtable(tablename)) == NULL) {
--- 97,106 ----
  cmd_bind_key_mode_table(struct cmd *self, struct cmd_q *cmdq, key_code key)
  {
  	struct args			*args = self->args;
! 	const char			*tablename;
  	const struct mode_key_table	*mtab;
  	struct mode_key_binding		*mbind, mtmp;
  	enum mode_key_cmd		 cmd;
  
  	tablename = args_get(args, 't');
  	if ((mtab = mode_key_findtable(tablename)) == NULL) {
***************
*** 116,161 ****
  		return (CMD_RETURN_ERROR);
  	}
  
! 	switch (cmd) {
! 	case MODEKEYCOPY_APPENDSELECTION:
! 	case MODEKEYCOPY_COPYSELECTION:
! 	case MODEKEYCOPY_STARTNAMEDBUFFER:
! 		if (args->argc == 2)
! 			arg = NULL;
! 		else {
! 			arg = args->argv[2];
! 			if (strcmp(arg, "-x") != 0) {
! 				cmdq_error(cmdq, "unknown argument");
! 				return (CMD_RETURN_ERROR);
! 			}
! 		}
! 		break;
! 	case MODEKEYCOPY_COPYPIPE:
! 		if (args->argc != 3) {
! 			cmdq_error(cmdq, "no argument given");
! 			return (CMD_RETURN_ERROR);
! 		}
! 		arg = args->argv[2];
! 		break;
! 	default:
! 		if (args->argc != 2) {
! 			cmdq_error(cmdq, "no argument allowed");
! 			return (CMD_RETURN_ERROR);
! 		}
! 		arg = NULL;
! 		break;
  	}
  
- 	repeat = 1;
- 	if (args_has(args, 'R')) {
- 		repeat = args_strtonum(args, 'R', 1, SHRT_MAX, &cause);
- 		if (cause != NULL) {
- 			cmdq_error(cmdq, "repeat count %s", cause);
- 			free(cause);
- 			return (CMD_RETURN_ERROR);
- 		}
- 	}
- 
  	mtmp.key = key;
  	mtmp.mode = !!args_has(args, 'c');
  	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) == NULL) {
--- 114,124 ----
  		return (CMD_RETURN_ERROR);
  	}
  
! 	if (args->argc != 2) {
! 		cmdq_error(cmdq, "no argument allowed");
! 		return (CMD_RETURN_ERROR);
  	}
  
  	mtmp.key = key;
  	mtmp.mode = !!args_has(args, 'c');
  	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) == NULL) {
***************
*** 164,171 ****
  		mbind->mode = mtmp.mode;
  		RB_INSERT(mode_key_tree, mtab->tree, mbind);
  	}
- 	mbind->repeat = repeat;
  	mbind->cmd = cmd;
- 	mbind->arg = arg != NULL ? xstrdup(arg) : NULL;
  	return (CMD_RETURN_NORMAL);
  }
--- 127,132 ----