From a863834574ec02b87ff0e7245ef31f0d4543ab34 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 4 Jun 2015 11:43:51 +0000
Subject: Add support for a single "marked pane". There is one marked pane in
 the server at a time; it may be toggled or cleared with select-pane -m and -M
 (the border is highlighted). A new target '~' or '{marked}' specifies the
 marked pane to commands and it is the default target for the swap-pane and
 join-pane -s flag (this makes them much simpler to use - mark the source pane
 and then change to the target pane to run swapp or joinp).

---
 cmd-join-pane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-join-pane.c')

diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index 943cdce4..b995b674 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -75,7 +75,7 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 	dst_idx = dst_wl->idx;
 	server_unzoom_window(dst_w);
 
-	src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
+	src_wl = cmd_find_pane_marked(cmdq, args_get(args, 's'), NULL, &src_wp);
 	if (src_wl == NULL)
 		return (CMD_RETURN_ERROR);
 	src_w = src_wl->window;
-- 
cgit v1.2.3