aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-02-08 18:10:07 +0000
committerTiago Cunha <tcunha@gmx.com>2010-02-08 18:10:07 +0000
commita32d095c97177eaa7ba7d2a3c723df1b878e9922 (patch)
treee67b2e8974142e2eec1d28bf8d146cdba647cadd /window.c
parent676d0809d2ecd38df0a135d505106f53cbed17fc (diff)
downloadrtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.tar.gz
rtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.tar.bz2
rtmux-a32d095c97177eaa7ba7d2a3c723df1b878e9922.zip
Sync OpenBSD patchset 635:
Instead of bailing out on the first configuration file error, carry on, collecting all the errors, then start with the active window in more mode displaying them.
Diffstat (limited to 'window.c')
-rw-r--r--window.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/window.c b/window.c
index 10f9f167..c48dc798 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.125 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: window.c,v 1.126 2010-02-08 18:10:07 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -664,9 +664,6 @@ window_pane_parse(struct window_pane *wp)
char *data;
size_t new_size;
- if (wp->mode != NULL)
- return;
-
new_size = EVBUFFER_LENGTH(wp->event->input) - wp->pipe_off;
if (wp->pipe_fd != -1 && new_size > 0) {
data = EVBUFFER_DATA(wp->event->input);