Revision: 2544
          http://tmux.svn.sourceforge.net/tmux/?rev=2544&view=rev
Author:   tcunha
Date:     2011-07-05 10:42:09 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/cmd-respawn-pane.c
    trunk/cmd-respawn-window.c

Modified: trunk/cmd-respawn-pane.c
===================================================================
--- trunk/cmd-respawn-pane.c    2011-07-04 14:04:55 UTC (rev 2543)
+++ trunk/cmd-respawn-pane.c    2011-07-05 10:42:09 UTC (rev 2544)
@@ -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 <[email protected]>
@@ -68,10 +68,7 @@
        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)

Modified: trunk/cmd-respawn-window.c
===================================================================
--- trunk/cmd-respawn-window.c  2011-07-04 14:04:55 UTC (rev 2543)
+++ trunk/cmd-respawn-window.c  2011-07-05 10:42:09 UTC (rev 2544)
@@ -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 <[email protected]>
@@ -87,7 +87,9 @@
                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();


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to