Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-06-15 12:01:11 +01:00
4 changed files with 74 additions and 16 deletions

3
tmux.h
View File

@ -825,6 +825,7 @@ struct window_mode {
void (*key)(struct window_pane *, struct client *, struct session *,
key_code, struct mouse_event *);
};
#define WINDOW_MODE_TIMEOUT 180
/* Structures for choose mode. */
struct window_choose_data {
@ -907,6 +908,8 @@ struct window_pane {
const struct window_mode *mode;
void *modedata;
struct event modetimer;
time_t modelast;
TAILQ_ENTRY(window_pane) entry;
RB_ENTRY(window_pane) tree_entry;