Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-01-04 10:01:20 +00:00
3 changed files with 22 additions and 7 deletions

View File

@ -68,6 +68,9 @@ static const char *options_table_set_clipboard_list[] = {
static const char *options_table_window_size_list[] = {
"largest", "smallest", "manual", "latest", NULL
};
static const char *options_table_remain_on_exit_list[] = {
"off", "on", "failed", NULL
};
/* Status line format. */
#define OPTIONS_TABLE_STATUS_FORMAT1 \
@ -948,11 +951,12 @@ const struct options_table_entry options_table[] = {
},
{ .name = "remain-on-exit",
.type = OPTIONS_TABLE_FLAG,
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
.choices = options_table_remain_on_exit_list,
.default_num = 0,
.text = "Whether panes should remain ('on') or be automatically "
"killed ('off') when the program inside exits."
"killed ('off' or 'failed') when the program inside exits."
},
{ .name = "synchronize-panes",