diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-23 02:01:33 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-23 02:01:33 +0100 |
| commit | cf5f93b2b39c9730095a42af9e21d6960b7c0071 (patch) | |
| tree | d8b8cd07b9f3624fdb94c7b9feaa350556d1ee1c /cmd-join-pane.c | |
| parent | 4a31eedc26284c04d679fe62e2a1986be74825d0 (diff) | |
| parent | 950af3363678de5b88cb6713f4837f1001e46d47 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-join-pane.c')
| -rw-r--r-- | cmd-join-pane.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 6583db75..2e4bec50 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -49,8 +49,8 @@ const struct cmd_entry cmd_move_pane_entry = { .name = "move-pane", .alias = "movep", - .args = { "bdhvp:l:s:t:", 0, 0 }, - .usage = "[-bdhv] [-l size] " CMD_SRCDST_PANE_USAGE, + .args = { "bdfhvp:l:s:t:", 0, 0 }, + .usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE, .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED }, .target = { 't', CMD_FIND_PANE, 0 }, @@ -71,16 +71,11 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) struct window *src_w, *dst_w; struct window_pane *src_wp, *dst_wp; char *cause = NULL; - int size, percentage, dst_idx, not_same_window; + int size, percentage, dst_idx; int flags; enum layout_type type; struct layout_cell *lc; - if (cmd_get_entry(self) == &cmd_join_pane_entry) - not_same_window = 1; - else - not_same_window = 0; - dst_s = target->s; dst_wl = target->wl; dst_wp = target->wp; @@ -93,11 +88,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) src_w = src_wl->window; server_unzoom_window(src_w); - if (not_same_window && src_w == dst_w) { - cmdq_error(item, "can't join a pane to its own window"); - return (CMD_RETURN_ERROR); - } - if (!not_same_window && src_wp == dst_wp) { + if (src_wp == dst_wp) { cmdq_error(item, "source and target panes must be different"); return (CMD_RETURN_ERROR); } |