diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
commit | cb89f2f2a197db5bf7e1acc8248f381c6f0410cd (patch) | |
tree | 9074f8aa373b1bcb857fee46a47d305152cacf06 /cmd-choose-buffer.c | |
parent | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d (diff) | |
parent | b87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff) | |
download | rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.gz rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.bz2 rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.zip |
Merge branch 'obsd-master'
Conflicts:
Makefile
format.c
Diffstat (limited to 'cmd-choose-buffer.c')
-rw-r--r-- | cmd-choose-buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c index af178976..b4590306 100644 --- a/cmd-choose-buffer.c +++ b/cmd-choose-buffer.c @@ -65,7 +65,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); utf8flag = options_get_number(&wl->window->options, "utf8"); - if (paste_get_top() == NULL) + if (paste_get_top(NULL) == NULL) return (CMD_RETURN_NORMAL); if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0) @@ -85,7 +85,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq) cdata->ft_template = xstrdup(template); format_defaults_paste_buffer(cdata->ft, pb, utf8flag); - xasprintf(&action_data, "%s", pb->name); + xasprintf(&action_data, "%s", paste_buffer_name(pb)); cdata->command = cmd_template_replace(action, action_data, 1); free(action_data); |