Merge branch 'master' into floating_panes

This commit is contained in:
Nicholas Marriott
2026-05-27 20:27:48 +01:00
3 changed files with 40 additions and 63 deletions

View File

@@ -1239,7 +1239,7 @@ const struct options_table_entry options_table[] = {
{ .name = "floating-pane-border-style",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
.default_str = "default",
.flags = OPTIONS_TABLE_IS_STYLE,
.separator = ",",
@@ -1250,7 +1250,7 @@ const struct options_table_entry options_table[] = {
{ .name = "floating-pane-style",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
.default_str = "default",
.flags = OPTIONS_TABLE_IS_STYLE,
.separator = ",",