===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-swap-pane.c	2012/07/11 07:10:15	1.14
--- src/usr.bin/tmux/cmd-swap-pane.c	2013/03/24 09:54:10	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.14 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.15 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,33 ****
   */
  
  void		 cmd_swap_pane_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	"swap-pane", "swapp",
--- 27,33 ----
   */
  
  void		 cmd_swap_pane_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	"swap-pane", "swapp",
***************
*** 50,56 ****
  }
  
  enum cmd_retval
! cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
  	struct winlink		*src_wl, *dst_wl;
--- 50,56 ----
  }
  
  enum cmd_retval
! cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
  	struct winlink		*src_wl, *dst_wl;
***************
*** 59,65 ****
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &dst_wp);
  	if (dst_wl == NULL)
  		return (CMD_RETURN_ERROR);
  	dst_w = dst_wl->window;
--- 59,65 ----
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &dst_wp);
  	if (dst_wl == NULL)
  		return (CMD_RETURN_ERROR);
  	dst_w = dst_wl->window;
***************
*** 77,83 ****
  		} else
  			return (CMD_RETURN_NORMAL);
  	} else {
! 		src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp);
  		if (src_wl == NULL)
  			return (CMD_RETURN_ERROR);
  		src_w = src_wl->window;
--- 77,83 ----
  		} else
  			return (CMD_RETURN_NORMAL);
  	} else {
! 		src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
  		if (src_wl == NULL)
  			return (CMD_RETURN_ERROR);
  		src_w = src_wl->window;