Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.c

1 files changed, 1 insertions, 1 deletions

diff --git a/window.c b/window.c
index f5915e5d..70d332fc 100644
--- a/window.c
+++ b/window.c
@@ -892,7 +892,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
 	ws.ws_col = screen_size_x(&wp->base);
 	ws.ws_row = screen_size_y(&wp->base);
 
-	switch (wp->pid = forkpty(&wp->fd, wp->tty, NULL, &ws)) {
+	switch (wp->pid = pty_fork(ptm_fd, &wp->fd, wp->tty, sizeof wp->tty, &ws)) {
 	case -1:
 		wp->fd = -1;
 		xasprintf(cause, "%s: %s", cmd, strerror(errno));