===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/cmd-swap-pane.c	2015/08/30 15:43:40	1.21
--- src/usr.bin/tmux/cmd-swap-pane.c	2015/12/13 14:32:38	1.22
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.21 2015/08/30 15:43:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.22 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  	"swap-pane", "swapp",
  	"dDs:t:U", 0, 0,
  	"[-dDU] " CMD_SRCDST_PANE_USAGE,
! 	0,
  	cmd_swap_pane_exec
  };
  
--- 32,38 ----
  	"swap-pane", "swapp",
  	"dDs:t:U", 0, 0,
  	"[-dDU] " CMD_SRCDST_PANE_USAGE,
! 	CMD_PANE_MARKED_S|CMD_PANE_T,
  	cmd_swap_pane_exec
  };
  
***************
*** 40,55 ****
  cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct winlink		*src_wl, *dst_wl;
  	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_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;
  	server_unzoom_window(dst_w);
  
  	if (!args_has(args, 's')) {
--- 40,57 ----
  cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct winlink          *src_wl, *dst_wl;
  	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_wl = cmdq->state.tflag.wl;
  	dst_w = dst_wl->window;
+ 	dst_wp = cmdq->state.tflag.wp;
+ 	src_wp = cmdq->state.sflag.wp;
+ 	src_wl = cmdq->state.sflag.wl;
+ 	src_w = src_wl->window;
  	server_unzoom_window(dst_w);
  
  	if (!args_has(args, 's')) {
***************
*** 62,80 ****
  			src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  			if (src_wp == NULL)
  				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
- 		} else {
- 			src_wl = cmd_find_pane_marked(cmdq, NULL, NULL,
- 			    &src_wp);
- 			if (src_wl == NULL)
- 				return (CMD_RETURN_ERROR);
- 			src_w = src_wl->window;
  		}
- 	} else {
- 		src_wl = cmd_find_pane_marked(cmdq, args_get(args, 's'), NULL,
- 		    &src_wp);
- 		if (src_wl == NULL)
- 			return (CMD_RETURN_ERROR);
- 		src_w = src_wl->window;
  	}
  	server_unzoom_window(src_w);
  
--- 64,70 ----