Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2013-01-17 01:38:21 +00:00
13 changed files with 117 additions and 163 deletions

View File

@ -90,6 +90,13 @@ const struct options_table_entry server_options_table[] = {
/* Session options. */
const struct options_table_entry session_options_table[] = {
{ .name = "assume-paste-time",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 1,
},
{ .name = "base-index",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,
@ -509,13 +516,6 @@ const struct options_table_entry window_options_table[] = {
.default_num = 0
},
{ .name = "layout-history-limit",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 1,
.maximum = USHRT_MAX,
.default_num = 20
},
{ .name = "main-pane-height",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 1,