diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
| commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch) | |
| tree | 852fa9fde3126091fa90ee6604097373076772b1 /options-table.c | |
| parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff) | |
| parent | acef311fe356f408690e9f94727ed63a934b742f (diff) | |
| download | rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2 rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tty-keys.c
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/options-table.c b/options-table.c index 7b09a687..c73ac84d 100644 --- a/options-table.c +++ b/options-table.c @@ -97,6 +97,14 @@ const struct options_table_entry server_options_table[] = { .default_num = 1 }, + { .name = "terminal-overrides", + .type = OPTIONS_TABLE_STRING, + .default_str = "*256col*:colors=256" + ",xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007" + ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007" + ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT" + }, + { .name = NULL } }; @@ -465,14 +473,6 @@ const struct options_table_entry session_options_table[] = { .default_num = 0 /* overridden in main() */ }, - { .name = "terminal-overrides", - .type = OPTIONS_TABLE_STRING, - .default_str = "*256col*:colors=256" - ",xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007" - ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007" - ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT" - }, - { .name = "update-environment", .type = OPTIONS_TABLE_STRING, .default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID " |