circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-04-29 18:42:12 +01:00
parent 8794562a85 69b8f100b7
commit c0cf4843e5
6 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
options-table.c
View File

@ -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