Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its

use more clearly defined and preparation for some future work).

1 files changed, 2 insertions, 5 deletions

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 588623f7..1fc45b0f 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -86,9 +86,6 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	struct args			*args = cmd_get_args(self);
 	struct cmd_load_buffer_data	*cdata;
 	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;
 	const char			*bufname = args_get(args, 'b');
 	char				*path;
 
@@ -99,8 +96,8 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		cdata->name = NULL;
 
-	path = format_single(item, args->argv[0], c, s, wl, wp);
-	file_read(item->client, path, cmd_load_buffer_done, cdata);
+	path = format_single_from_target(item, args->argv[0], c);
+	file_read(cmdq_get_client(item), path, cmd_load_buffer_done, cdata);
 	free(path);
 
 	return (CMD_RETURN_WAIT);