diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
| commit | 9e537c808b95e01165f1c2831b3737b93c0110c3 (patch) | |
| tree | c4e0394a8c366356187696f03cf6cd21923ca42a /cmd-swap-pane.c | |
| parent | 4ccb2e2c218a10a8039ca801231aaf09b6bf3bce (diff) | |
| parent | 2c4543b9e9bd38bcc45393dad94930bcde872e6c (diff) | |
| download | rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.gz rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.bz2 rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index d484f4e2..05317260 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) |