From 5116aaa51a6059904a6b8ae75bffa77c95ceb41a Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Sun, 8 Nov 2009 22:53:13 +0000
Subject: [PATCH] Sync OpenBSD patchset 492:

A couple of minor cosmetic changes.
---
 server-window.c | 4 ++--
 tmux.c          | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server-window.c b/server-window.c
index 80a20330..3890c855 100644
--- a/server-window.c
+++ b/server-window.c
@@ -1,4 +1,4 @@
-/* $Id: server-window.c,v 1.5 2009-11-08 22:40:36 tcunha Exp $ */
+/* $Id: server-window.c,v 1.6 2009-11-08 22:53:13 tcunha 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/tmux.c b/tmux.c
index 6ef45dea..621b0b91 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.185 2009-11-08 22:40:36 tcunha Exp $ */
+/* $Id: tmux.c,v 1.186 2009-11-08 22:53:13 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -507,7 +507,6 @@ main(int argc, char **argv)
 	client_main();	/* doesn't return */
 }
 
-
 void
 main_set_signals(void)
 {