aboutsummaryrefslogtreecommitdiff
path: root/cmd-load-buffer.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
commit8f2b5d714a9f854c9583cab8bae70a2c7323fa00 (patch)
tree4e887ff4a1fcb3703fb0a1fcaa751183cff24c12 /cmd-load-buffer.c
parentb117c3b81217a11946ac784cfbe2ef1f3725b207 (diff)
parent04cdd035250b93b728678d515b69690653dced4e (diff)
downloadrtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.gz
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.bz2
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-load-buffer.c')
-rw-r--r--cmd-load-buffer.c7
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);