===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-save-buffer.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- src/usr.bin/tmux/cmd-save-buffer.c	2020/04/13 08:26:27	1.48
+++ src/usr.bin/tmux/cmd-save-buffer.c	2020/04/13 10:59:58	1.49
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-save-buffer.c,v 1.48 2020/04/13 08:26:27 nicm Exp $ */
+/* $OpenBSD: cmd-save-buffer.c,v 1.49 2020/04/13 10:59:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -75,9 +75,6 @@
 {
 	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;
@@ -101,12 +98,12 @@
 	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);