diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-03-02 18:10:51 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-03-02 18:10:51 +0000 |
| commit | e304673c65d774bb76e5d55c095c8c8e6b05ff91 (patch) | |
| tree | af461e71978b76dad59348d924a37f62b8c0bb7d /cmd-swap-pane.c | |
| parent | e9d369a09e48ea8f940958025c8444988d31e840 (diff) | |
| parent | b8a102d26f41e57b94359627a4df8f22af10c6fa (diff) | |
| download | rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.tar.gz rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.tar.bz2 rtmux-e304673c65d774bb76e5d55c095c8c8e6b05ff91.zip | |
Merge branch 'obsd-master'
Conflicts:
utf8.c
Diffstat (limited to 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index aec7753d..13575e0a 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -45,28 +45,23 @@ const struct cmd_entry cmd_swap_pane_entry = { enum cmd_retval cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) { - struct winlink *src_wl, *dst_wl; struct window *src_w, *dst_w; struct window_pane *tmp_wp, *src_wp, *dst_wp; struct layout_cell *src_lc, *dst_lc; u_int sx, sy, xoff, yoff; - dst_wl = cmdq->state.tflag.wl; - dst_w = dst_wl->window; + dst_w = cmdq->state.tflag.wl->window; dst_wp = cmdq->state.tflag.wp; - src_wl = cmdq->state.sflag.wl; - src_w = src_wl->window; + src_w = cmdq->state.sflag.wl->window; src_wp = cmdq->state.sflag.wp; server_unzoom_window(dst_w); if (args_has(self->args, 'D')) { - src_wl = dst_wl; src_w = dst_w; src_wp = TAILQ_NEXT(dst_wp, entry); if (src_wp == NULL) src_wp = TAILQ_FIRST(&dst_w->panes); } else if (args_has(self->args, 'U')) { - src_wl = dst_wl; src_w = dst_w; src_wp = TAILQ_PREV(dst_wp, window_panes, entry); if (src_wp == NULL) |