===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/tmux/cmd-swap-pane.c	2016/10/13 22:48:51	1.29
--- src/usr.bin/tmux/cmd-swap-pane.c	2016/10/16 19:04:05	1.30
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.29 2016/10/13 22:48:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.30 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 26,32 ****
   * Swap two panes.
   */
  
! static enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	.name = "swap-pane",
--- 26,32 ----
   * Swap two panes.
   */
  
! static enum cmd_retval	cmd_swap_pane_exec(struct cmd *, struct cmdq_item *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	.name = "swap-pane",
***************
*** 43,59 ****
  };
  
  static enum cmd_retval
! cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct window		*src_w, *dst_w;
  	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_w = cmdq->state.tflag.wl->window;
! 	dst_wp = cmdq->state.tflag.wp;
! 	src_w = cmdq->state.sflag.wl->window;
! 	src_wp = cmdq->state.sflag.wp;
  	server_unzoom_window(dst_w);
  
  	if (args_has(self->args, 'D')) {
--- 43,59 ----
  };
  
  static enum cmd_retval
! cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct window		*src_w, *dst_w;
  	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_w = item->state.tflag.wl->window;
! 	dst_wp = item->state.tflag.wp;
! 	src_w = item->state.sflag.wl->window;
! 	src_wp = item->state.sflag.wp;
  	server_unzoom_window(dst_w);
  
  	if (args_has(self->args, 'D')) {