===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/usr.bin/tmux/cmd-swap-pane.c	2014/10/20 22:29:25	1.19
+++ src/usr.bin/tmux/cmd-swap-pane.c	2015/06/04 11:43:51	1.20
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-swap-pane.c,v 1.19 2014/10/20 22:29:25 nicm Exp $ */
+/* $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>
@@ -58,18 +58,22 @@
 			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(cmdq, NULL, NULL, &src_wp);
+			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(cmdq, args_get(args, 's'), NULL, &src_wp);
+		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;