Use screen_reinit for respawn-pane to keep history and call input_init

for respawn-window to break out of waiting for DCS/OSC to finish.

2 files changed, 5 insertions, 6 deletions

diff --git a/usr.bin/tmux/cmd-respawn-pane.c b/usr.bin/tmux/cmd-respawn-pane.c
index 163d4674db9..51781b856d8 100644
--- a/usr.bin/tmux/cmd-respawn-pane.c
+++ b/usr.bin/tmux/cmd-respawn-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-respawn-pane.c,v 1.1 2011/06/05 11:19:03 nicm Exp $ */
+/* $Id: cmd-respawn-pane.c,v 1.2 2011/07/04 13:35:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -68,10 +68,7 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	server_fill_environ(s, &env);
 
 	window_pane_reset_mode(wp);
-	screen_free(&wp->base);
-	hlimit = options_get_number(&s->options, "history-limit");
-	screen_init(&wp->base, wp->sx, wp->sy, hlimit);
-	wp->screen = &wp->base;
+	screen_reinit(&wp->base);
 	input_init(wp);
 
 	if (args->argc != 0)
diff --git a/usr.bin/tmux/cmd-respawn-window.c b/usr.bin/tmux/cmd-respawn-window.c
index e0f70d22634..6cc4b3e3b6c 100644
--- a/usr.bin/tmux/cmd-respawn-window.c
+++ b/usr.bin/tmux/cmd-respawn-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-respawn-window.c,v 1.13 2011/01/04 00:42:47 nicm Exp $ */
+/* $OpenBSD: cmd-respawn-window.c,v 1.14 2011/07/04 13:35:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -87,7 +87,9 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	}
 	layout_init(w);
+	window_pane_reset_mode(wp);
 	screen_reinit(&wp->base);
+	input_init(wp);
 	window_set_active_pane(w, wp);
 
 	recalculate_sizes();