From cfc81692e64fee9b64ae72dbd978096bed435ab1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 11 Jul 2018 08:29:21 +0000
Subject: Expand formats in load-buffer and save-buffer.

---
 cmd-load-buffer.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 74f97d1d..6920a21a 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -56,11 +56,14 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_load_buffer_data	*cdata;
-	struct client			*c = item->client;
+	struct client			*c = cmd_find_client(item, NULL, 1);
+	struct session			*s = item->target.s;
+	struct winlink			*wl = item->target.wl;
+	struct window_pane		*wp = item->target.wp;
 	FILE				*f;
-	const char			*path, *bufname;
+	const char			*bufname;
 	char				*pdata = NULL, *new_pdata, *cause;
-	char				*file;
+	char				*path, *file;
 	size_t				 psize;
 	int				 ch, error;
 
@@ -68,8 +71,11 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'b'))
 		bufname = args_get(args, 'b');
 
-	path = args->argv[0];
+	path = format_single(item, args->argv[0], c, s, wl, wp);
 	if (strcmp(path, "-") == 0) {
+		free(path);
+		c = item->client;
+
 		cdata = xcalloc(1, sizeof *cdata);
 		cdata->item = item;
 
-- 
cgit