From 743ab5728da1ce950a3782d5bc08831f61c5d744 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 21 Jul 2020 05:24:33 +0000
Subject: Fix show-buffer when run from inside tmux, GitHub issue 2314.

---
 cmd-save-buffer.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'cmd-save-buffer.c')

diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index a6ad188f..5e45e279 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -74,11 +74,12 @@ static enum cmd_retval
 cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
+	struct client		*c = cmdq_get_client(item);
 	struct paste_buffer	*pb;
 	int			 flags;
 	const char		*bufname = args_get(args, 'b'), *bufdata;
 	size_t			 bufsize;
-	char			*path;
+	char			*path, *tmp;
 
 	if (bufname == NULL) {
 		if ((pb = paste_get_top(NULL)) == NULL) {
@@ -94,9 +95,16 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	}
 	bufdata = paste_buffer_data(pb, &bufsize);
 
-	if (cmd_get_entry(self) == &cmd_show_buffer_entry)
+	if (cmd_get_entry(self) == &cmd_show_buffer_entry) {
+		if (c->session != NULL || (c->flags & CLIENT_CONTROL)) {
+			utf8_stravisx(&tmp, bufdata, bufsize,
+			    VIS_OCTAL|VIS_CSTYLE|VIS_TAB);
+			cmdq_print(item, "%s", tmp);
+			free(tmp);
+			return (CMD_RETURN_NORMAL);
+		}
 		path = xstrdup("-");
-	else
+	} else
 		path = format_single_from_target(item, args->argv[0]);
 	if (args_has(args, 'a'))
 		flags = O_APPEND;
-- 
cgit v1.2.3