===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-bind-key.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/cmd-bind-key.c	2013/03/24 09:54:10	1.16
--- src/usr.bin/tmux/cmd-bind-key.c	2013/10/10 12:00:18	1.17
***************
*** 1,4 ****
! /* $OpenBSD: cmd-bind-key.c,v 1.16 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-bind-key.c,v 1.17 2013/10/10 12:00:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,33 ****
   * Bind a key to a command, this recurses through cmd_*.
   */
  
- enum cmd_retval	 cmd_bind_key_check(struct args *);
  enum cmd_retval	 cmd_bind_key_exec(struct cmd *, struct cmd_q *);
  
  enum cmd_retval	 cmd_bind_key_table(struct cmd *, struct cmd_q *, int);
--- 27,32 ----
***************
*** 38,67 ****
  	"[-cnr] [-t key-table] key command [arguments]",
  	0,
  	NULL,
- 	cmd_bind_key_check,
  	cmd_bind_key_exec
  };
  
  enum cmd_retval
- cmd_bind_key_check(struct args *args)
- {
- 	if (args_has(args, 't')) {
- 		if (args->argc != 2 && args->argc != 3)
- 			return (CMD_RETURN_ERROR);
- 	} else {
- 		if (args->argc < 2)
- 			return (CMD_RETURN_ERROR);
- 	}
- 	return (CMD_RETURN_NORMAL);
- }
- 
- enum cmd_retval
  cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	char		*cause;
  	struct cmd_list	*cmdlist;
  	int		 key;
  
  	key = key_string_lookup_string(args->argv[0]);
  	if (key == KEYC_NONE) {
--- 37,64 ----
  	"[-cnr] [-t key-table] key command [arguments]",
  	0,
  	NULL,
  	cmd_bind_key_exec
  };
  
  enum cmd_retval
  cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	char		*cause;
  	struct cmd_list	*cmdlist;
  	int		 key;
+ 
+ 	if (args_has(args, 't')) {
+ 		if (args->argc != 2 && args->argc != 3) {
+ 			cmdq_error(cmdq, "not enough arguments");
+ 			return (CMD_RETURN_ERROR);
+ 		}
+ 	} else {
+ 		if (args->argc < 2) {
+ 			cmdq_error(cmdq, "not enough arguments");
+ 			return (CMD_RETURN_ERROR);
+ 		}
+ 	}
  
  	key = key_string_lookup_string(args->argv[0]);
  	if (key == KEYC_NONE) {