===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/tmux/cmd-swap-pane.c	2015/06/04 11:43:51	1.20
--- src/usr.bin/tmux/cmd-swap-pane.c	2015/08/30 15:43:40	1.21
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.20 2015/06/04 11:43:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 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>
***************
*** 58,69 ****
  			src_wp = TAILQ_NEXT(dst_wp, entry);
  			if (src_wp == NULL)
  				src_wp = TAILQ_FIRST(&dst_w->panes);
- 			src_wl = dst_wl;
  		} else if (args_has(self->args, 'U')) {
  			src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  			if (src_wp == NULL)
  				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
- 			src_wl = dst_wl;
  		} else {
  			src_wl = cmd_find_pane_marked(cmdq, NULL, NULL,
  			    &src_wp);
--- 58,67 ----