Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2022-06-21 12:01:09 +01:00
5 changed files with 37 additions and 18 deletions

3
tmux.h
View File

@ -726,6 +726,7 @@ struct grid_line {
u_int extdsize;
int flags;
time_t time;
};
/* Entire grid of cells. */
@ -2096,6 +2097,7 @@ void format_add_cb(struct format_tree *, const char *, format_cb);
void format_log_debug(struct format_tree *, const char *);
void format_each(struct format_tree *, void (*)(const char *,
const char *, void *), void *);
char *format_pretty_time(time_t, int);
char *format_expand_time(struct format_tree *, const char *);
char *format_expand(struct format_tree *, const char *);
char *format_single(struct cmdq_item *, const char *,
@ -2588,6 +2590,7 @@ extern struct tmuxproc *server_proc;
extern struct clients clients;
extern struct cmd_find_state marked_pane;
extern struct message_list message_log;
extern time_t current_time;
void server_set_marked(struct session *, struct winlink *,
struct window_pane *);
void server_clear_marked(void);