===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-bind-key.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/tmux/cmd-bind-key.c	2019/05/25 07:18:20	1.33
--- src/usr.bin/tmux/cmd-bind-key.c	2019/05/27 12:16:27	1.34
***************
*** 1,4 ****
! /* $OpenBSD: cmd-bind-key.c,v 1.33 2019/05/25 07:18:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-bind-key.c,v 1.34 2019/05/27 12:16:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 44,57 ****
  static enum cmd_retval
  cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = self->args;
! 	key_code		 key;
! 	const char		*tablename;
! 	struct cmd_parse_result	*pr;
  
! 	key = key_string_lookup_string(args->argv[0]);
  	if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
! 		cmdq_error(item, "unknown key: %s", args->argv[0]);
  		return (CMD_RETURN_ERROR);
  	}
  
--- 44,59 ----
  static enum cmd_retval
  cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		 *args = self->args;
! 	key_code		  key;
! 	const char		 *tablename;
! 	struct cmd_parse_result	 *pr;
! 	char			**argv = args->argv;
! 	int			  argc = args->argc;
  
! 	key = key_string_lookup_string(argv[0]);
  	if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
! 		cmdq_error(item, "unknown key: %s", argv[0]);
  		return (CMD_RETURN_ERROR);
  	}
  
***************
*** 62,68 ****
  	else
  		tablename = "prefix";
  
! 	pr = cmd_parse_from_arguments(args->argc - 1, args->argv + 1, NULL);
  	switch (pr->status) {
  	case CMD_PARSE_EMPTY:
  		cmdq_error(item, "empty command");
--- 64,73 ----
  	else
  		tablename = "prefix";
  
! 	if (argc == 2)
! 		pr = cmd_parse_from_string(argv[1], NULL);
! 	else
! 		pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
  	switch (pr->status) {
  	case CMD_PARSE_EMPTY:
  		cmdq_error(item, "empty command");