Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Conflicts:
	cmd-if-shell.c
	cmd-run-shell.c
	tmux.1
This commit is contained in:
Nicholas Marriott
2013-02-23 22:42:49 +00:00
6 changed files with 62 additions and 49 deletions

9
tmux.1
View File

@ -3470,6 +3470,7 @@ Miscellaneous commands are as follows:
Display a large clock.
.It Xo Ic if-shell
.Op Fl b
.Op Fl t Ar target-pane
.Ar shell-command command
.Op Ar command
.Xc
@ -3485,6 +3486,10 @@ With
.Fl b ,
.Ar shell-command
is run in the background.
Before being executed, shell-command is expanded using the rules specified in the
.Sx FORMATS
section, including those relevant to
.Ar target-pane .
.It Ic lock-server
.D1 (alias: Ic lock )
Lock each client individually by running the command specified by the
@ -3502,6 +3507,10 @@ without creating a window.
With
.Fl b ,
the command is run in the background.
Before being executed, shell-command is expanded using the rules specified in
the
.Sx FORMATS
section.
After it finishes, any output to stdout is displayed in copy mode (in the pane
specified by
.Fl t