diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
| commit | da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf (patch) | |
| tree | cf9c86c3218659faf46e606a1e38bc6ebb570dcd /tmux.c | |
| parent | 5a501a8ae27c2d0128870caa48c5708e97528567 (diff) | |
| parent | b90a9fcd13f4434aed0fe1785d619aa668bbc77d (diff) | |
| download | rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.gz rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.bz2 rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.zip | |
Merge branch 'master' into 3.0-rc
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); } |