Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-03 22:01:18 +00:00
6 changed files with 29 additions and 6 deletions

4
tmux.h
View File

@ -547,7 +547,6 @@ struct grid_cell {
int fg;
int bg;
struct utf8_data data;
};
struct grid_cell_entry {
u_char flags;
@ -938,6 +937,8 @@ struct session {
struct winlink_stack lastw;
struct winlinks windows;
int statusat;
struct hooks *hooks;
struct options *options;
@ -1866,6 +1867,7 @@ void server_unzoom_window(struct window *);
/* status.c */
void status_timer_start(struct client *);
void status_timer_start_all(void);
void status_update_saved(struct session *s);
int status_at_line(struct client *);
struct window *status_get_window_at(struct client *, u_int);
int status_redraw(struct client *);