From fc69b9ccb79fc5d1a345918d1ceccf990eb723ef Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Fri, 14 May 2010 14:30:01 +0000
Subject: Sync OpenBSD patchset 696:

Make signal handler setup/teardown two common functions instead of six,
and reset SIGCHLD after fork to fix problems with some shells. From
Romain Francoise.
---
 window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index 5250b721..68f30f78 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.130 2010-04-06 21:59:19 nicm Exp $ */
+/* $Id: window.c,v 1.131 2010-05-14 14:30:01 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -527,7 +527,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 
 		environ_push(env);
 
-		server_signal_clear();
+		clear_signals();
 		log_close();
 
 		if (*wp->cmd != '\0') {
-- 
cgit