===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/notify.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/tmux/notify.c	2016/10/10 21:29:23	1.9
+++ src/usr.bin/tmux/notify.c	2016/10/15 00:01:01	1.10
@@ -1,4 +1,4 @@
-/* $OpenBSD: notify.c,v 1.9 2016/10/10 21:29:23 nicm Exp $ */
+/* $OpenBSD: notify.c,v 1.10 2016/10/15 00:01:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 George Nachman <tmux@georgester.com>
@@ -45,25 +45,10 @@
 };
 TAILQ_HEAD(notify_queue, notify_entry);
 static struct notify_queue notify_queue = TAILQ_HEAD_INITIALIZER(notify_queue);
-static int	notify_enabled = 1;
 
-static void	notify_drain(void);
 static void	notify_add(enum notify_type, struct client *, struct session *,
 		    struct window *);
 
-void
-notify_enable(void)
-{
-	notify_enabled = 1;
-	notify_drain();
-}
-
-void
-notify_disable(void)
-{
-	notify_enabled = 0;
-}
-
 static void
 notify_add(enum notify_type type, struct client *c, struct session *s,
     struct window *w)
@@ -85,14 +70,11 @@
 		w->references++;
 }
 
-static void
+void
 notify_drain(void)
 {
 	struct notify_entry	*ne, *ne1;
 
-	if (!notify_enabled)
-		return;
-
 	TAILQ_FOREACH_SAFE(ne, &notify_queue, entry, ne1) {
 		switch (ne->type) {
 		case NOTIFY_WINDOW_LAYOUT_CHANGED:
@@ -137,13 +119,6 @@
 notify_input(struct window_pane *wp, struct evbuffer *input)
 {
 	struct client	*c;
-
-	/*
-	 * notify_input() is not queued and only does anything when
-	 * notifications are enabled.
-	 */
-	if (!notify_enabled)
-		return;
 
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->flags & CLIENT_CONTROL)