diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-06-04 12:59:41 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-06-04 12:59:41 +0100 |
| commit | 02e348c069b9f49b44344281276b81fe537b3c8b (patch) | |
| tree | 889ef55ab3da4ba5e3a8fe6aa7c3cb5708cdd724 /cmd-swap-pane.c | |
| parent | 1de74e27e535b3e294c265974973a7743c8374a0 (diff) | |
| parent | a863834574ec02b87ff0e7245ef31f0d4543ab34 (diff) | |
| download | rtmux-02e348c069b9f49b44344281276b81fe537b3c8b.tar.gz rtmux-02e348c069b9f49b44344281276b81fe537b3c8b.tar.bz2 rtmux-02e348c069b9f49b44344281276b81fe537b3c8b.zip | |
Merge branch 'obsd-master'
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 918a2e4f..c4751c36 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -58,18 +58,22 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) 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; |