summaryrefslogtreecommitdiffstats
path: root/cmd-swap-pane.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2013-03-28 15:08:12 +0000
committerNicholas Marriott <nicm@openbsd.org>2013-03-28 15:08:12 +0000
commit738e789dbd7712ab94073036cf4e903abc68447f (patch)
tree628ab91871d09105ceb9a0311882b11bc362c14e /cmd-swap-pane.c
parent66afcf5be092ed0ab86d1d4059426823e72c63d5 (diff)
If -s to swap-pane is not given, use the current pane.
Diffstat (limited to 'cmd-swap-pane.c')
-rw-r--r--cmd-swap-pane.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index e7ea6242..e6b46d67 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -75,8 +75,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
if (src_wp == NULL)
src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
- } else
- return (CMD_RETURN_NORMAL);
+ } else {
+ src_wl = cmd_find_pane(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);
if (src_wl == NULL)