diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-05-13 09:44:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-05-13 09:44:11 +0100 |
| commit | 00471dc78358bde092df65de5e2c375bf9be7437 (patch) | |
| tree | 4db96614bbc7e70dcdeaa307a3280103beee2f9e /options-table.c | |
| parent | 4165ed96f8f0c494c7bd4f793176e508b6b6581d (diff) | |
| parent | 3f4ee98162cd5bb7000f93fec0e631e123b1281d (diff) | |
| download | rtmux-00471dc78358bde092df65de5e2c375bf9be7437.tar.gz rtmux-00471dc78358bde092df65de5e2c375bf9be7437.tar.bz2 rtmux-00471dc78358bde092df65de5e2c375bf9be7437.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/options-table.c b/options-table.c index 756931db..f4a4879a 100644 --- a/options-table.c +++ b/options-table.c @@ -48,7 +48,7 @@ const char *options_table_status_position_list[] = { "top", "bottom", NULL }; const char *options_table_bell_action_list[] = { - "none", "any", "current", NULL + "none", "any", "current", "other", NULL }; /* Server options. */ @@ -295,7 +295,7 @@ const struct options_table_entry session_options_table[] = { { .name = "set-titles-string", .type = OPTIONS_TABLE_STRING, - .default_str = "#S:#I:#W - \"#T\"" + .default_str = "#S:#I:#W - \"#T\" #{session_alerts}" }, { .name = "status", @@ -484,20 +484,6 @@ const struct options_table_entry window_options_table[] = { "#{?pane_dead,[dead],}" }, - { .name = "c0-change-trigger", - .type = OPTIONS_TABLE_NUMBER, - .default_num = 250, - .minimum = 0, - .maximum = USHRT_MAX - }, - - { .name = "c0-change-interval", - .type = OPTIONS_TABLE_NUMBER, - .default_num = 100, - .minimum = 1, - .maximum = USHRT_MAX - }, - { .name = "clock-mode-colour", .type = OPTIONS_TABLE_COLOUR, .default_num = 4 |