summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 20:59:23 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 20:59:23 +0000
commitc4951f362efa741b6aaf42f94c0cfb7073db3d9f (patch)
tree1ad98c8cfebf708d09eb8b01d27f44b114cc5ec3
parent891ac5e256beff387c5a745dc912f221cc17024e (diff)
A couple of minor cosmetic changes.
-rw-r--r--usr.bin/tmux/server-window.c4
-rw-r--r--usr.bin/tmux/tmux.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/server-window.c b/usr.bin/tmux/server-window.c
index 4bc2a608f34..2bd3a98dc56 100644
--- a/usr.bin/tmux/server-window.c
+++ b/usr.bin/tmux/server-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-window.c,v 1.5 2009/11/04 20:50:11 nicm Exp $ */
+/* $OpenBSD: server-window.c,v 1.6 2009/11/04 20:59:22 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -48,7 +48,7 @@ server_window_prepare(void)
continue;
events = 0;
if (!server_window_backoff(wp))
- events = EV_READ;
+ events |= EV_READ;
if (BUFFER_USED(wp->out) > 0)
events |= EV_WRITE;
event_del(&wp->event);
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index caacae8a393..23d9b59ea6d 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.55 2009/11/04 20:50:11 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.56 2009/11/04 20:59:22 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -504,7 +504,6 @@ main(int argc, char **argv)
client_main(); /* doesn't return */
}
-
void
main_set_signals(void)
{