summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd-join-pane.c13
-rw-r--r--tmux.12
2 files changed, 9 insertions, 6 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index b6eff0fe..5344f3ec 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -36,8 +36,8 @@ const struct cmd_entry cmd_join_pane_entry = {
.name = "join-pane",
.alias = "joinp",
- .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 },
@@ -143,10 +143,13 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
else
size = (dst_wp->sx * percentage) / 100;
}
+
+ flags = 0;
if (args_has(args, 'b'))
- flags = SPAWN_BEFORE;
- else
- flags = 0;
+ flags |= SPAWN_BEFORE;
+ if (args_has(args, 'f'))
+ flags |= SPAWN_FULLSIZE;
+
lc = layout_split_pane(dst_wp, type, size, flags);
if (lc == NULL) {
cmdq_error(item, "create pane failed: pane too small");
diff --git a/tmux.1 b/tmux.1
index e617ec61..3649e0f6 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1890,7 +1890,7 @@ zooms the pane.
.Pp
This command works only if at least one client is attached.
.It Xo Ic join-pane
-.Op Fl bdhv
+.Op Fl bdfhv
.Op Fl l Ar size
.Op Fl s Ar src-pane
.Op Fl t Ar dst-pane