Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-05-30 12:01:13 +01:00
5 changed files with 91 additions and 39 deletions

4
tmux.h
View File

@ -945,10 +945,14 @@ struct window {
#define WINDOW_ZOOMED 0x1000
#define WINDOW_FORCEWIDTH 0x2000
#define WINDOW_FORCEHEIGHT 0x4000
#define WINDOW_STYLECHANGED 0x8000
#define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
struct options *options;
struct grid_cell style;
struct grid_cell active_style;
u_int references;
RB_ENTRY(window) entry;