summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-06-20 12:00:00 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-06-20 12:00:00 +0000
commit9018d1a5d9c3876ba76b89bb53c907db590c1c3f (patch)
tree311564d5c3e691e38c6131878e7f96004b734654 /usr.bin/tmux/tmux.c
parent5e5bcefafb962acd2a2d0e4d84dd1c185830a215 (diff)
Add a per-pane option set. Pane options inherit from window options (so
there should be no change to existing behaviour) and are set and shown with set-option -p and show-options -p. Change remain-on-exit and window-style/window-active-style to be pane options (some others will be changed later). This makes select-pane -P and -g unnecessary so no longer document them (they still work) and no longer document set-window-option and show-window-options in favour of set-option -w and show-options -w.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index e837961022b..4dda60659d8 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.188 2019/04/26 11:38:51 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.189 2019/06/20 11:59:59 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -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);
}