Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-06-02 11:29:48 +01:00
7 changed files with 223 additions and 178 deletions

3
tmux.h
View File

@ -1854,6 +1854,7 @@ extern int ptm_fd;
extern const char *shell_command;
int checkshell(const char *);
void setblocking(int, int);
uint64_t get_timer(void);
const char *sig2name(int);
const char *find_cwd(void);
const char *find_home(void);
@ -1914,6 +1915,7 @@ char *paste_make_sample(struct paste_buffer *);
#define FORMAT_WINDOW 0x40000000U
struct format_tree;
struct format_modifier;
typedef char *(*format_cb)(struct format_tree *);
const char *format_skip(const char *, const char *);
int format_true(const char *);
struct format_tree *format_create(struct client *, struct cmdq_item *, int,
@ -1924,6 +1926,7 @@ void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);
void format_add_tv(struct format_tree *, const char *,
struct timeval *);
void format_add_cb(struct format_tree *, const char *, format_cb);
void format_each(struct format_tree *, void (*)(const char *,
const char *, void *), void *);
char *format_expand_time(struct format_tree *, const char *);