diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
| commit | cb89f2f2a197db5bf7e1acc8248f381c6f0410cd (patch) | |
| tree | 9074f8aa373b1bcb857fee46a47d305152cacf06 /cmd-swap-pane.c | |
| parent | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d (diff) | |
| parent | b87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff) | |
| download | rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.gz rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.bz2 rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
format.c
Diffstat (limited to 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index c4751c36..dc2b7246 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -58,12 +58,10 @@ 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_marked(cmdq, NULL, NULL, &src_wp); |