Merge branch 'obsd-master'

1 files changed, 5 insertions, 3 deletions

diff --git a/window.c b/window.c
index e4cc51d3..1b30c793 100644
--- a/window.c
+++ b/window.c
@@ -1478,6 +1478,9 @@ window_pane_input_callback(struct client *c, int closed, void *data)
 {
 	struct window_pane_input_data	*cdata = data;
 	struct window_pane		*wp;
+	struct evbuffer			*evb = c->stdin_data;
+	u_char				*buf = EVBUFFER_DATA(evb);
+	size_t				 len = EVBUFFER_LENGTH(evb);
 
 	wp = window_pane_find_by_id(cdata->wp);
 	if (wp == NULL || closed || c->flags & CLIENT_DEAD) {
@@ -1490,9 +1493,8 @@ window_pane_input_callback(struct client *c, int closed, void *data)
 		return;
 	}
 
-	if (evbuffer_add_buffer(wp->event->input, c->stdin_data) != 0)
-		evbuffer_drain(c->stdin_data, EVBUFFER_LENGTH(c->stdin_data));
-	input_parse(wp);
+	input_parse_buffer(wp, buf, len);
+	evbuffer_drain(evb, len);
 }
 
 int