aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-15 02:01:12 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-15 02:01:12 +0100
commit623e54788e77068779933eb60a042e5a82f32673 (patch)
tree02ce8da6ff4062b9d4c4b9846960f6f9849e0b2b /tmux.h
parent3d2686a236b4ffee762ada8ebb493d8db91f7375 (diff)
parent3f138dc40c37ddee021b92e5d29676ed96b6cab8 (diff)
downloadrtmux-623e54788e77068779933eb60a042e5a82f32673.tar.gz
rtmux-623e54788e77068779933eb60a042e5a82f32673.tar.bz2
rtmux-623e54788e77068779933eb60a042e5a82f32673.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index f33a04d2..e61472f8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1579,8 +1579,7 @@ void mode_key_init(struct mode_key_data *, struct mode_key_tree *);
enum mode_key_cmd mode_key_lookup(struct mode_key_data *, key_code);
/* notify.c */
-void notify_enable(void);
-void notify_disable(void);
+void notify_drain(void);
void notify_input(struct window_pane *, struct evbuffer *);
void notify_window_layout_changed(struct window *);
void notify_window_unlinked(struct session *, struct window *);
@@ -1745,6 +1744,8 @@ int cmd_find_from_session(struct cmd_find_state *,
struct session *);
int cmd_find_from_winlink(struct cmd_find_state *,
struct session *, struct winlink *);
+int cmd_find_from_session_window(struct cmd_find_state *,
+ struct session *, struct window *);
int cmd_find_from_window(struct cmd_find_state *, struct window *);
int cmd_find_from_pane(struct cmd_find_state *,
struct window_pane *);
@@ -2209,7 +2210,7 @@ void control_notify_window_renamed(struct window *);
void control_notify_attached_session_changed(struct client *);
void control_notify_session_renamed(struct session *);
void control_notify_session_created(struct session *);
-void control_notify_session_close(struct session *);
+void control_notify_session_closed(struct session *);
/* session.c */
extern struct sessions sessions;