Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-06-20 11:02:28 +01:00
4 changed files with 62 additions and 94 deletions

3
tmux.h
View File

@@ -1821,6 +1821,9 @@ struct options_entry *options_set_number(struct options *, const char *,
long long);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *);
enum options_table_scope options_scope_from_name(struct args *, int,
const char *, struct cmd_find_state *, struct options **,
char **);
enum options_table_scope options_scope_from_flags(struct args *, int,
struct cmd_find_state *, struct options **, char **);