aboutsummaryrefslogtreecommitdiff
path: root/options-table.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-04-29 18:42:12 +0100
committerThomas Adam <thomas@xteddy.org>2015-04-29 18:42:12 +0100
commitc0cf4843e50ae7b123613798c209f30440d73e55 (patch)
tree7e5724f11e8cbfa0a4480a6dacb04fb98ee68246 /options-table.c
parent8794562a85ab7221b4ec3b165723faa8ca10db0a (diff)
parent69b8f100b70061ee2520fb30368a955cf39e47db (diff)
downloadrtmux-c0cf4843e50ae7b123613798c209f30440d73e55.tar.gz
rtmux-c0cf4843e50ae7b123613798c209f30440d73e55.tar.bz2
rtmux-c0cf4843e50ae7b123613798c209f30440d73e55.zip
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
-rw-r--r--options-table.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/options-table.c b/options-table.c
index d3959626..a4f3ac4c 100644
--- a/options-table.c
+++ b/options-table.c
@@ -60,6 +60,11 @@ const struct options_table_entry server_options_table[] = {
.default_num = 20
},
+ { .name = "default-terminal",
+ .type = OPTIONS_TABLE_STRING,
+ .default_str = "screen"
+ },
+
{ .name = "escape-time",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,
@@ -142,11 +147,6 @@ const struct options_table_entry session_options_table[] = {
.default_str = _PATH_BSHELL
},
- { .name = "default-terminal",
- .type = OPTIONS_TABLE_STRING,
- .default_str = "screen"
- },
-
{ .name = "destroy-unattached",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0