Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-08-12 00:01:26 +01:00
14 changed files with 940 additions and 477 deletions

View File

@ -184,6 +184,7 @@ const struct options_name_map options_other_names[] = {
{ "display-panes-color", "display-panes-colour" },
{ "display-panes-active-color", "display-panes-active-colour" },
{ "clock-mode-color", "clock-mode-colour" },
{ "pane-colors", "pane-colours" },
{ NULL, NULL }
};
@ -972,6 +973,14 @@ const struct options_table_entry options_table[] = {
.text = "Style of the pane status lines."
},
{ .name = "pane-colours",
.type = OPTIONS_TABLE_COLOUR,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
.default_str = "",
.flags = OPTIONS_TABLE_IS_ARRAY,
.text = "The default colour palette for colours zero to 255."
},
{ .name = "remain-on-exit",
.type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,