Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-12 16:01:13 +00:00
6 changed files with 44 additions and 52 deletions

8
tmux.h
View File

@ -1629,14 +1629,14 @@ struct options_entry *options_next(struct options_entry *);
struct options_entry *options_find1(struct options *, const char *);
struct options_entry *options_find(struct options *, const char *);
void options_remove(struct options *, const char *);
struct options_entry *printflike(3, 4) options_set_string(struct options *,
const char *, const char *, ...);
struct options_entry * printflike(4, 5) options_set_string(struct options *,
const char *, int, const char *, ...);
char *options_get_string(struct options *, const char *);
struct options_entry *options_set_number(struct options *, const char *,
long long);
long long options_get_number(struct options *, const char *);
struct options_entry *options_set_style(struct options *, const char *,
const char *, int);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *);
struct grid_cell *options_get_style(struct options *, const char *);
/* options-table.c */