circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-27 19:02:25 +01:00
commit 793f4d89d6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
format.c
View File

@ -77,7 +77,6 @@ static void format_defaults_winlink(struct format_tree *, struct winlink *);
"|" \ "|" \
"Kill,X,kill-window|" \ "Kill,X,kill-window|" \
"Respawn,R,respawn-window -k|" \ "Respawn,R,respawn-window -k|" \
"|" \
"#{?pane_marked,Unmark,Mark},m,select-pane -m|" \ "#{?pane_marked,Unmark,Mark},m,select-pane -m|" \
"Rename,n,command-prompt -I \"#W\" \"rename-window -- '%%'\"|" \ "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 \ #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,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,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_word,Copy #[underscore]#{=/9/...:mouse_word},},c,set-buffer \"#{q:mouse_word}\"|" \
"#{?mouse_line,Copy Line,},l,set-buffer \"#{q:mouse_line}\"|" \ "#{?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|" \ "Kill,X,kill-pane|" \
"Respawn,R,respawn-pane -k|" \ "Respawn,R,respawn-pane -k|" \
"|" \
"#{?pane_marked,Unmark,Mark},m,select-pane -m|" \ "#{?pane_marked,Unmark,Mark},m,select-pane -m|" \
"#{?window_zoomed_flag,Unzoom,Zoom},z,resize-pane -Z" "#{?window_zoomed_flag,Unzoom,Zoom},z,resize-pane -Z"

6
tmux.1
View File

@ -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 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). line (the \e and the newline are completely removed).
This is called line continuation and applies both inside and outside quoted 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 .Pp
Command arguments may be specified as strings surrounded by single (') quotes, Command arguments may be specified as strings surrounded by single (') quotes,
double quotes (") or braces ({}). double quotes (") or braces ({}).
@ -528,7 +528,9 @@ variable.
.El .El
.Pp .Pp
Braces are similar to single quotes in that the text inside is taken literally 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 They are designed to avoid the need for additional escaping when passing a group
of of
.Nm .Nm