===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-resize-pane.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/cmd-resize-pane.c	2013/03/22 10:37:39	1.13
--- src/usr.bin/tmux/cmd-resize-pane.c	2013/03/24 09:54:10	1.14
***************
*** 1,4 ****
! /* $OpenBSD: cmd-resize-pane.c,v 1.13 2013/03/22 10:37:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-resize-pane.c,v 1.14 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,33 ****
   */
  
  void		 cmd_resize_pane_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
--- 27,33 ----
   */
  
  void		 cmd_resize_pane_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_resize_pane_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
***************
*** 82,88 ****
  }
  
  enum cmd_retval
! cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
--- 82,88 ----
  }
  
  enum cmd_retval
! cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
***************
*** 92,98 ****
  	u_int			 adjust;
  	int			 x, y;
  
! 	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (args->argc == 0)
--- 92,98 ----
  	u_int			 adjust;
  	int			 x, y;
  
! 	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	if (args->argc == 0)
***************
*** 100,106 ****
  	else {
  		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
  		if (errstr != NULL) {
! 			ctx->error(ctx, "adjustment %s", errstr);
  			return (CMD_RETURN_ERROR);
  		}
  	}
--- 100,106 ----
  	else {
  		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
  		if (errstr != NULL) {
! 			cmdq_error(cmdq, "adjustment %s", errstr);
  			return (CMD_RETURN_ERROR);
  		}
  	}
***************
*** 109,115 ****
  		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			ctx->error(ctx, "width %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
--- 109,115 ----
  		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(cmdq, "width %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
***************
*** 119,125 ****
  		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			ctx->error(ctx, "height %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
--- 119,125 ----
  		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
  		    &cause);
  		if (cause != NULL) {
! 			cmdq_error(cmdq, "height %s", cause);
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}