===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/tmux/cmd-swap-pane.c	2016/01/19 15:59:12	1.25
--- src/usr.bin/tmux/cmd-swap-pane.c	2016/03/01 12:02:54	1.26
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.25 2016/01/19 15:59:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.26 2016/03/01 12:02:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 45,72 ****
  enum cmd_retval
  cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
- 	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_wl = cmdq->state.sflag.wl;
! 	src_w = src_wl->window;
  	src_wp = cmdq->state.sflag.wp;
  	server_unzoom_window(dst_w);
  
  	if (args_has(self->args, 'D')) {
- 		src_wl = dst_wl;
  		src_w = dst_w;
  		src_wp = TAILQ_NEXT(dst_wp, entry);
  		if (src_wp == NULL)
  			src_wp = TAILQ_FIRST(&dst_w->panes);
  	} else if (args_has(self->args, 'U')) {
- 		src_wl = dst_wl;
  		src_w = dst_w;
  		src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  		if (src_wp == NULL)
--- 45,67 ----
  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')) {
  		src_w = dst_w;
  		src_wp = TAILQ_NEXT(dst_wp, entry);
  		if (src_wp == NULL)
  			src_wp = TAILQ_FIRST(&dst_w->panes);
  	} else if (args_has(self->args, 'U')) {
  		src_w = dst_w;
  		src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  		if (src_wp == NULL)