Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-05-30 00:01:14 +01:00
4 changed files with 37 additions and 6 deletions

View File

@ -124,7 +124,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SERVER,
.default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007"
":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT",
.separator = ","
},
@ -484,7 +484,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SESSION,
.default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID "
"SSH_CONNECTION WINDOWID XAUTHORITY"
"SSH_CONNECTION WINDOWID XAUTHORITY"
},
{ .name = "visual-activity",
@ -539,7 +539,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}"
"#{?pane_dead,[dead],}"
"#{?pane_dead,[dead],}"
},
{ .name = "clock-mode-colour",
@ -697,7 +697,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
"\"#{pane_title}\""
"\"#{pane_title}\""
},
{ .name = "pane-border-status",