circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-11-24 10:01:13 +00:00
commit 534f9e3ab1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options-table.c
View File

@ -891,6 +891,8 @@ options_table_populate_tree(enum options_table_scope scope, struct options *oo)
const struct options_table_entry *oe; const struct options_table_entry *oe;
for (oe = options_table; oe->name != NULL; oe++) { for (oe = options_table; oe->name != NULL; oe++) {
if (oe->scope == OPTIONS_TABLE_NONE)
fatalx("no scope for %s", oe->name);
if (oe->scope != scope) if (oe->scope != scope)
continue; continue;
switch (oe->type) { switch (oe->type) {

1
tmux.h
View File

@ -1396,6 +1396,7 @@ enum options_table_type {
OPTIONS_TABLE_STYLE OPTIONS_TABLE_STYLE
}; };
enum options_table_scope { enum options_table_scope {
OPTIONS_TABLE_NONE,
OPTIONS_TABLE_SERVER, OPTIONS_TABLE_SERVER,
OPTIONS_TABLE_SESSION, OPTIONS_TABLE_SESSION,
OPTIONS_TABLE_WINDOW, OPTIONS_TABLE_WINDOW,