From: nicm <nicm@openbsd.org>
Date: Tue, 6 Jun 2017 15:07:35 +0000 (+0000)
Subject: Do not pass a state into commands when fired on individual items in tree
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8af98d93e7b7df0fd764387957d5031c52c3380e;p=openbsd

Do not pass a state into commands when fired on individual items in tree
mode, rely on the %% target substitution in the command for the chosen
pane and leave the default target as the current pane (where the mode
is). Otherwise, joinp and similar end up with -t and -s the
same. Reported by Jacob Niehus in GitHub issue 960.
---

diff --git a/usr.bin/tmux/window-tree.c b/usr.bin/tmux/window-tree.c
index c0c1e90ab26..9f7d9304327 100644
--- a/usr.bin/tmux/window-tree.c
+++ b/usr.bin/tmux/window-tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-tree.c,v 1.1 2017/05/30 21:44:59 nicm Exp $ */
+/* $OpenBSD: window-tree.c,v 1.2 2017/06/06 15:07:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -699,7 +699,7 @@ window_tree_key(struct window_pane *wp, struct client *c,
 		name = window_tree_get_target(item, &fs);
 		window_pane_reset_mode(wp);
 		if (name != NULL)
-			mode_tree_run_command(c, &fs, command, name);
+			mode_tree_run_command(c, NULL, command, name);
 		free(name);
 		free(command);
 		return;