aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-11-24 18:50:24 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-11-24 18:50:24 +0000
commit0a2ef2b932f37d54157d82e526a8097caf9143ba (patch)
tree10d790321ad8fac46207da6f1526424fe1663825
parent7b085136a7291cbcdfcc53182fbd13aaca70306e (diff)
parent534f9e3ab1a8cd8c10b7546b72e28095ba13b26e (diff)
downloadrtmux-0a2ef2b932f37d54157d82e526a8097caf9143ba.tar.gz
rtmux-0a2ef2b932f37d54157d82e526a8097caf9143ba.tar.bz2
rtmux-0a2ef2b932f37d54157d82e526a8097caf9143ba.zip
Merge branch 'master' of github.com:tmux/tmux
-rw-r--r--options-table.c2
-rw-r--r--tmux.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/options-table.c b/options-table.c
index 054b2700..ab61ef79 100644
--- a/options-table.c
+++ b/options-table.c
@@ -891,6 +891,8 @@ options_table_populate_tree(enum options_table_scope scope, struct options *oo)
const struct options_table_entry *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)
continue;
switch (oe->type) {
diff --git a/tmux.h b/tmux.h
index 6ed3035c..ed2893b6 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1396,6 +1396,7 @@ enum options_table_type {
OPTIONS_TABLE_STYLE
};
enum options_table_scope {
+ OPTIONS_TABLE_NONE,
OPTIONS_TABLE_SERVER,
OPTIONS_TABLE_SESSION,
OPTIONS_TABLE_WINDOW,