The branch, master has been updated
via 931b0103cda864466b7e357d298d2c4de0a7f5d5 (commit)
via 6e03b50771134b68bf2c96d547ebe0fff675a84e (commit)
from 362c4607671621c4f4265a0089dd1d313e2b7608 (commit)
- Log -----------------------------------------------------------------
commit 931b0103cda864466b7e357d298d2c4de0a7f5d5
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Clarify choose-tree entry in man page.
---
tmux.1 | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/tmux.1 b/tmux.1
index eba13be..efb4437 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1154,25 +1154,30 @@ is given, will show sessions.
If
.Fl w
is given, will show windows.
-If
+.Pp
+By default, the tree is collapsed and sessions must be expanded to windows
+with the right arrow key.
+The
.Fl u
-is given, the tree is uncollapsed by default.
+will start with all all sessions expanded instead.
+.Pp
If
.Fl b
is given, will override the default session command.
Note that
.Ql %%
-can be used, and will be replaced with the session name.
+can be used and will be replaced with the session name.
The default option if not specified is "switch-client -t '%%'".
If
.Fl c
is given, will override the default window command.
-Note that
+Like
+.Fl b ,
.Ql %%
-can be used, and will be replaced with the session name and window index.
-This command will run
-.Ar session-template
-before it.
+can be used and will be replaced with the session name and window index.
+When a window is chosen from the list, the session command is run before the
+window command.
+.Pp
If
.Fl S
is given will display the specified format instead of the default session
@@ -1188,6 +1193,7 @@ and
options, see the
.Sx FORMATS
section.
+.Pp
This command works only if at least one client is attached.
.It Xo
.Ic choose-window
commit 6e03b50771134b68bf2c96d547ebe0fff675a84e
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Run session command before window in choose-tree.
---
cmd-choose-tree.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index e12e4c3..51a329e 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -203,8 +203,8 @@ windows_only:
cur_win = idx_ses;
}
- xasprintf(&final_win_action, "%s ; %s", win_action,
- wcd ? wcd->command : "");
+ xasprintf(&final_win_action, "%s ; %s",
+ wcd ? wcd->command : "", win_action);
if (win_ses != win_max)
cur_win_template = final_win_template_middle;
-----------------------------------------------------------------------
Summary of changes:
cmd-choose-tree.c | 4 ++--
tmux.1 | 22 ++++++++++++++--------
2 files changed, 16 insertions(+), 10 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
