From f84d32ca5e7b3820134c4fa8296c9c85aa015b9a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 31 Dec 2015 18:14:13 +0000
Subject: [PATCH 1/2] Use saved pipe buffer offset when writing to pipe, from
 Nicolas Viennot.

---
 window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/window.c b/window.c
index 67d047b9..cfb44ae3 100644
--- a/window.c
+++ b/window.c
@@ -948,7 +948,7 @@ window_pane_read_callback(__unused struct bufferevent *bufev, void *data)
 
 	new_size = EVBUFFER_LENGTH(evb) - wp->pipe_off;
 	if (wp->pipe_fd != -1 && new_size > 0) {
-		new_data = EVBUFFER_DATA(evb);
+		new_data = EVBUFFER_DATA(evb) + wp->pipe_off;
 		bufferevent_write(wp->pipe_event, new_data, new_size);
 	}
 

From 7e67db79dca50184ee9dec4456ccf38756201a9e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 31 Dec 2015 18:34:47 +0000
Subject: [PATCH 2/2] Remove an extra unzoom call which was probably a merge
 error.

---
 cmd-select-pane.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index 6ebe753c..02385a41 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -85,12 +85,6 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	server_unzoom_window(wp->window);
-	if (!window_pane_visible(wp)) {
-		cmdq_error(cmdq, "pane not visible");
-		return (CMD_RETURN_ERROR);
-	}
-
 	if (args_has(args, 'm') || args_has(args, 'M')) {
 		if (args_has(args, 'm') && !window_pane_visible(wp))
 			return (CMD_RETURN_NORMAL);