diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-07-05 10:42:09 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-07-05 10:42:09 +0000 |
| commit | 5dad3166f92903a5f0182649ef0e5f35de2247b4 (patch) | |
| tree | ecba05334a691629f4118ab052b4693ba220b0ff | |
| parent | e80e7b38bb171d1f282c3fd5e6640fb6c2cb617d (diff) | |
| download | rtmux-5dad3166f92903a5f0182649ef0e5f35de2247b4.tar.gz rtmux-5dad3166f92903a5f0182649ef0e5f35de2247b4.tar.bz2 rtmux-5dad3166f92903a5f0182649ef0e5f35de2247b4.zip | |
Sync OpenBSD patchset 931:
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.
| -rw-r--r-- | cmd-respawn-pane.c | 7 | ||||
| -rw-r--r-- | cmd-respawn-window.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c index 163d4674..51781b85 100644 --- a/cmd-respawn-pane.c +++ b/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/cmd-respawn-window.c b/cmd-respawn-window.c index a2090706..eb45d17e 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-respawn-window.c,v 1.26 2011-01-07 14:45:34 tcunha Exp $ */ +/* $Id$ */ /* * 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(); |