aboutsummaryrefslogtreecommitdiff
path: root/options-table.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-03-08 16:28:56 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-03-08 16:28:56 +0000
commit77603c4f2de1961b3da141b3e6e4ce2f983365d4 (patch)
tree4ea1533af8574a91a074fbebea204380f5e00dc8 /options-table.c
parent7019f77c05f45ea9267f7e768d0abb0b6a928a25 (diff)
parent9880114aff0b48649f00266125da1dc3c94a70eb (diff)
downloadrtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.gz
rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.bz2
rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'options-table.c')
-rw-r--r--options-table.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/options-table.c b/options-table.c
index 64d3edcd..7b09a687 100644
--- a/options-table.c
+++ b/options-table.c
@@ -80,6 +80,13 @@ const struct options_table_entry server_options_table[] = {
.default_num = 0
},
+ { .name = "message-limit",
+ .type = OPTIONS_TABLE_NUMBER,
+ .minimum = 0,
+ .maximum = INT_MAX,
+ .default_num = 100
+ },
+
{ .name = "quiet",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0 /* overridden in main() */
@@ -234,13 +241,6 @@ const struct options_table_entry session_options_table[] = {
.style = "message-style"
},
- { .name = "message-limit",
- .type = OPTIONS_TABLE_NUMBER,
- .minimum = 0,
- .maximum = INT_MAX,
- .default_num = 20
- },
-
{ .name = "message-style",
.type = OPTIONS_TABLE_STYLE,
.default_str = "bg=yellow,fg=black"