summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/tmux/cmd-find-window.c8
-rw-r--r--usr.bin/tmux/key-bindings.c4
-rw-r--r--usr.bin/tmux/tmux.18
3 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd-find-window.c b/usr.bin/tmux/cmd-find-window.c
index 52a80fd16b6..9efa1912216 100644
--- a/usr.bin/tmux/cmd-find-window.c
+++ b/usr.bin/tmux/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find-window.c,v 1.44 2017/05/31 16:44:33 nicm Exp $ */
+/* $OpenBSD: cmd-find-window.c,v 1.45 2018/08/20 15:00:42 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -32,8 +32,8 @@ const struct cmd_entry cmd_find_window_entry = {
.name = "find-window",
.alias = "findw",
- .args = { "CNt:T", 1, 1 },
- .usage = "[-CNT] " CMD_TARGET_PANE_USAGE " match-string",
+ .args = { "CNt:TZ", 1, 1 },
+ .usage = "[-CNTZ] " CMD_TARGET_PANE_USAGE " match-string",
.target = { 't', CMD_FIND_PANE, 0 },
@@ -83,6 +83,8 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
xasprintf(&filter, "#{m:*%s*,#{pane_title}}", s);
new_args = args_parse("", 1, &argv);
+ if (args_has(args, 'Z'))
+ args_set(new_args, 'Z', NULL);
args_set(new_args, 'f', filter);
window_pane_set_mode(wp, &window_tree_mode, &item->target, new_args);
diff --git a/usr.bin/tmux/key-bindings.c b/usr.bin/tmux/key-bindings.c
index 67c4e6b01f7..fe7c818dac5 100644
--- a/usr.bin/tmux/key-bindings.c
+++ b/usr.bin/tmux/key-bindings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-bindings.c,v 1.86 2018/08/02 11:44:07 nicm Exp $ */
+/* $OpenBSD: key-bindings.c,v 1.87 2018/08/20 15:00:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -228,7 +228,7 @@ key_bindings_init(void)
"bind ] paste-buffer",
"bind c new-window",
"bind d detach-client",
- "bind f command-prompt \"find-window -- '%%'\"",
+ "bind f command-prompt \"find-window -Z -- '%%'\"",
"bind i display-message",
"bind l last-window",
"bind m select-pane -m",
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 5b00b01ed8b..8aefa0bf4f9 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.607 2018/07/23 19:02:49 kn Exp $
+.\" $OpenBSD: tmux.1,v 1.608 2018/08/20 15:00:42 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 23 2018 $
+.Dd $Mdocdate: August 20 2018 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -1540,7 +1540,7 @@ The default
.Ar template
is "select-pane -t '%%'".
.It Xo Ic find-window
-.Op Fl CNT
+.Op Fl CNTZ
.Op Fl t Ar target-pane
.Ar match-string
.Xc
@@ -1559,6 +1559,8 @@ matches only the window name and
matches only the window title.
The default is
.Fl CNT .
+.Fl Z
+zooms the pane.
.Pp
This command works only if at least one client is attached.
.It Xo Ic join-pane