diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-06-20 15:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-06-20 15:02:26 +0100 |
| commit | f8ad72b2eeafc1146c116f73194a3950aa0c2143 (patch) | |
| tree | 98b47921006cbb3e96d98fc8214824ec130e364e /tmux.c | |
| parent | a0e2c1b4cae9269d04ee2e80e1d1cb8adc78cd8a (diff) | |
| parent | 5f92f92908b81b4ec66682adb84b9ffc8d83c2f7 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -321,11 +321,11 @@ main(int argc, char **argv) global_s_options = options_create(NULL); global_w_options = options_create(NULL); for (oe = options_table; oe->name != NULL; oe++) { - if (oe->scope == OPTIONS_TABLE_SERVER) + if (oe->scope & OPTIONS_TABLE_SERVER) options_default(global_options, oe); - if (oe->scope == OPTIONS_TABLE_SESSION) + if (oe->scope & OPTIONS_TABLE_SESSION) options_default(global_s_options, oe); - if (oe->scope == OPTIONS_TABLE_WINDOW) + if (oe->scope & OPTIONS_TABLE_WINDOW) options_default(global_w_options, oe); } |