diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-24 22:01:13 +0000 |
| commit | 418ab1a553f46996d3524bab5c81b2c66fa7efc6 (patch) | |
| tree | b29b61f95da6d7732628cdfb6dcf5e23c2fede5e /options-table.c | |
| parent | f38a6bbd816533d01d14c8bbafbb51621e5e1326 (diff) | |
| parent | ffc28a7765f4b560427404c9679966232655e67e (diff) | |
| download | rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.gz rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.tar.bz2 rtmux-418ab1a553f46996d3524bab5c81b2c66fa7efc6.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/options-table.c b/options-table.c index 5eb2ad5d..403509ba 100644 --- a/options-table.c +++ b/options-table.c @@ -64,6 +64,16 @@ const struct options_table_entry options_table[] = { .default_num = 20 }, + { .name = "command-alias", + .type = OPTIONS_TABLE_ARRAY, + .scope = OPTIONS_TABLE_SERVER, + .default_str = "split-pane=split-window," + "splitp=split-window," + "server-info=show-messages -JT," + "info=show-messages -JT", + .separator = "," + }, + { .name = "default-terminal", .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_SERVER, @@ -111,11 +121,12 @@ const struct options_table_entry options_table[] = { }, { .name = "terminal-overrides", - .type = OPTIONS_TABLE_STRING, + .type = OPTIONS_TABLE_ARRAY, .scope = OPTIONS_TABLE_SERVER, .default_str = "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" + ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT", + .separator = "," }, { .name = "assume-paste-time", @@ -470,11 +481,10 @@ const struct options_table_entry options_table[] = { }, { .name = "update-environment", - .type = OPTIONS_TABLE_STRING, + .type = OPTIONS_TABLE_ARRAY, .scope = OPTIONS_TABLE_SESSION, .default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID " "SSH_CONNECTION WINDOWID XAUTHORITY" - }, { .name = "visual-activity", |