Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-08-16 14:01:15 +01:00
6 changed files with 46 additions and 25 deletions

View File

@ -149,7 +149,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list,
.default_num = BELL_OTHER
.default_num = ALERT_OTHER
},
{ .name = "assume-paste-time",
@ -172,7 +172,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list,
.default_num = BELL_ANY
.default_num = ALERT_ANY
},
{ .name = "default-command",
@ -357,7 +357,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SESSION,
.choices = options_table_bell_action_list,
.default_num = BELL_OTHER
.default_num = ALERT_OTHER
},
{ .name = "status",