diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-12-24 12:25:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-12-24 12:25:53 +0000 |
| commit | 60f7ed4fb342811e29e86573707963ec62e18f95 (patch) | |
| tree | 37ef306dd194d103c446f602e4a5d3fe3fb25d31 /usr.bin | |
| parent | 4b27420d3a479c5c24f55a27f7c14f2853579c75 (diff) | |
Add a -u flag to choose-tree to start uncollapsed, from Raghavendra D
Prabhu.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-choose-tree.c | 9 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-choose-tree.c b/usr.bin/tmux/cmd-choose-tree.c index ad183eebe75..d84d808aa09 100644 --- a/usr.bin/tmux/cmd-choose-tree.c +++ b/usr.bin/tmux/cmd-choose-tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-choose-tree.c,v 1.11 2012/09/24 12:53:55 nicm Exp $ */ +/* $OpenBSD: cmd-choose-tree.c,v 1.12 2012/12/24 12:25:52 nicm Exp $ */ /* * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org> @@ -39,8 +39,8 @@ void cmd_choose_tree_free(struct window_choose_data *); const struct cmd_entry cmd_choose_tree_entry = { "choose-tree", NULL, - "S:W:swb:c:t:", 0, 1, - "[-sw] [-b session-template] [-c window template] [-S format] " \ + "S:W:swub:c:t:", 0, 1, + "[-swu] [-b session-template] [-c window template] [-S format] " \ "[-W format] " CMD_TARGET_WINDOW_USAGE, 0, NULL, @@ -232,6 +232,9 @@ windows_only: window_choose_ready(wl->window->active, cur_win, cmd_choose_tree_callback, cmd_choose_tree_free); + if (args_has(args, 'u')) + window_choose_expand_all(wl->window->active); + return (CMD_RETURN_NORMAL); } diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index c497f1a0956..5d49571728c 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.308 2012/11/27 15:09:35 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.309 2012/12/24 12:25:52 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -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: November 27 2012 $ +.Dd $Mdocdate: December 24 2012 $ .Dt TMUX 1 .Os .Sh NAME @@ -1126,6 +1126,7 @@ This command works only from inside .Ic choose-tree .Op Fl s .Op Fl w +.Op Fl u .Op Fl b Ar session-template .Op Fl c Ar window-template .Op Fl S Ar format @@ -1151,6 +1152,9 @@ If .Fl w is given, will show windows. If +.Fl u +is given, the tree is uncollapsed by default. +If .Fl b is given, will override the default session command. Note that |