From 69d97f6d4b7a373eb2c05ef2c3ca18be3271871b Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 19 Mar 2013 09:34:00 +0000
Subject: [PATCH] Handle empty pending output (not a failure) and add \n. From
 George Nachman.

---
 cmd-capture-pane.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index 7ac00e0b..f59dc2d6 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -69,7 +69,7 @@ cmd_capture_pane_pending(struct args *args, struct window_pane *wp,
 	line = EVBUFFER_DATA(wp->ictx.since_ground);
 	linelen = EVBUFFER_LENGTH(wp->ictx.since_ground);
 
-	buf = NULL;
+	buf = xstrdup("");
 	if (args_has(args, 'C')) {
 		for (i = 0; i < linelen; i++) {
 			if (line[i] >= ' ') {
@@ -189,6 +189,8 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 			return (CMD_RETURN_ERROR);
 		}
 		evbuffer_add(c->stdout_data, buf, len);
+		if (args_has(args, 'P') && len > 0)
+		    evbuffer_add(c->stdout_data, "\n", 1);
 		server_push_stdout(c);
 	} else {
 		limit = options_get_number(&global_options, "buffer-limit");