summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-join-pane.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2021-01-06 07:32:23 +0000
committernicm <nicm@openbsd.org>2021-01-06 07:32:23 +0000
commitd189c051f2b0445da7aa5cf162333e12c2c04f90 (patch)
treeb5280f100aca1442c536eb98db10fc37d79ff492 /usr.bin/tmux/cmd-join-pane.c
parentRemove unused variable, from Ben Boeckel. (diff)
downloadwireguard-openbsd-d189c051f2b0445da7aa5cf162333e12c2c04f90.tar.xz
wireguard-openbsd-d189c051f2b0445da7aa5cf162333e12c2c04f90.zip
Insert joined pane before the target pane with -b, like for split. From
Takeshi Banse.
Diffstat (limited to 'usr.bin/tmux/cmd-join-pane.c')
-rw-r--r--usr.bin/tmux/cmd-join-pane.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-join-pane.c b/usr.bin/tmux/cmd-join-pane.c
index e550b5882b5..50ecc6fc9cd 100644
--- a/usr.bin/tmux/cmd-join-pane.c
+++ b/usr.bin/tmux/cmd-join-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-join-pane.c,v 1.46 2020/07/04 14:24:02 nicm Exp $ */
+/* $OpenBSD: cmd-join-pane.c,v 1.47 2021/01/06 07:32:23 nicm Exp $ */
/*
* Copyright (c) 2011 George Nachman <tmux@georgester.com>
@@ -143,7 +143,10 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
src_wp->window = dst_w;
options_set_parent(src_wp->options, dst_w->options);
src_wp->flags |= PANE_STYLECHANGED;
- TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
+ if (flags & SPAWN_BEFORE)
+ TAILQ_INSERT_BEFORE(dst_wp, src_wp, entry);
+ else
+ TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
layout_assign_pane(lc, src_wp);
recalculate_sizes();