Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-22 12:01:38 +01:00
6 changed files with 70 additions and 39 deletions

View File

@ -646,19 +646,15 @@ const struct options_table_entry options_table[] = {
},
{ .name = "main-pane-height",
.type = OPTIONS_TABLE_NUMBER,
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.minimum = 1,
.maximum = INT_MAX,
.default_num = 24
.default_str = "24"
},
{ .name = "main-pane-width",
.type = OPTIONS_TABLE_NUMBER,
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.minimum = 1,
.maximum = INT_MAX,
.default_num = 80
.default_str = "80"
},
{ .name = "mode-keys",
@ -695,19 +691,15 @@ const struct options_table_entry options_table[] = {
},
{ .name = "other-pane-height",
.type = OPTIONS_TABLE_NUMBER,
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 0
.default_str = "0"
},
{ .name = "other-pane-width",
.type = OPTIONS_TABLE_NUMBER,
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 0
.default_str = "0"
},
{ .name = "pane-active-border-style",