mirror of
https://github.com/tmux/tmux.git
synced 2025-01-12 19:39:04 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
793f4d89d6
3
format.c
3
format.c
@ -77,7 +77,6 @@ static void format_defaults_winlink(struct format_tree *, struct winlink *);
|
||||
"|" \
|
||||
"Kill,X,kill-window|" \
|
||||
"Respawn,R,respawn-window -k|" \
|
||||
"|" \
|
||||
"#{?pane_marked,Unmark,Mark},m,select-pane -m|" \
|
||||
"Rename,n,command-prompt -I \"#W\" \"rename-window -- '%%'\"|" \
|
||||
"|" \
|
||||
@ -86,7 +85,6 @@ static void format_defaults_winlink(struct format_tree *, struct winlink *);
|
||||
#define DEFAULT_PANE_MENU \
|
||||
"#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},},C-r,copy-mode -t=; send -Xt= search-backward \"#{q:mouse_word}\"|" \
|
||||
"#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},},C-y,send-keys -l \"#{q:mouse_word}\"|" \
|
||||
"|" \
|
||||
"#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},},c,set-buffer \"#{q:mouse_word}\"|" \
|
||||
"#{?mouse_line,Copy Line,},l,set-buffer \"#{q:mouse_line}\"|" \
|
||||
"|" \
|
||||
@ -99,7 +97,6 @@ static void format_defaults_winlink(struct format_tree *, struct winlink *);
|
||||
"|" \
|
||||
"Kill,X,kill-pane|" \
|
||||
"Respawn,R,respawn-pane -k|" \
|
||||
"|" \
|
||||
"#{?pane_marked,Unmark,Mark},m,select-pane -m|" \
|
||||
"#{?window_zoomed_flag,Unzoom,Zoom},z,resize-pane -Z"
|
||||
|
||||
|
6
tmux.1
6
tmux.1
@ -493,7 +493,7 @@ comment is ignored until the end of the line.
|
||||
If the last character of a line is \e, the line is joined with the following
|
||||
line (the \e and the newline are completely removed).
|
||||
This is called line continuation and applies both inside and outside quoted
|
||||
strings and in comments.
|
||||
strings and in comments, but not inside braces.
|
||||
.Pp
|
||||
Command arguments may be specified as strings surrounded by single (') quotes,
|
||||
double quotes (") or braces ({}).
|
||||
@ -528,7 +528,9 @@ variable.
|
||||
.El
|
||||
.Pp
|
||||
Braces are similar to single quotes in that the text inside is taken literally
|
||||
without replacements, but they can span multiple lines.
|
||||
without any replacements but this also includes line continuation.
|
||||
Braces can span multiple lines in which case a literal newline is included in the
|
||||
string.
|
||||
They are designed to avoid the need for additional escaping when passing a group
|
||||
of
|
||||
.Nm
|
||||
|
Loading…
Reference in New Issue
Block a user