Merge branch 'obsd-master'

1 files changed, 2 insertions, 5 deletions

diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index be907348..52262024 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -74,9 +74,6 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	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;
 	struct paste_buffer	*pb;
 	int			 flags;
 	const char		*bufname = args_get(args, 'b'), *bufdata;
@@ -100,12 +97,12 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	if (cmd_get_entry(self) == &cmd_show_buffer_entry)
 		path = xstrdup("-");
 	else
-		path = format_single(item, args->argv[0], c, s, wl, wp);
+		path = format_single_from_target(item, args->argv[0], c);
 	if (args_has(args, 'a'))
 		flags = O_APPEND;
 	else
 		flags = 0;
-	file_write(item->client, path, flags, bufdata, bufsize,
+	file_write(cmdq_get_client(item), path, flags, bufdata, bufsize,
 	    cmd_save_buffer_done, item);
 	free(path);