aboutsummaryrefslogtreecommitdiff
path: root/cmd-choose-buffer.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-06-18 09:31:07 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-06-18 09:31:07 +0100
commit77f582ff137808cc3743ad545f63422cc8e71a71 (patch)
tree5737aa67c96dcd11d3474989889189732e374900 /cmd-choose-buffer.c
parentf5973b77763e3f8da8e8f6483464f6f4bc2f3981 (diff)
parent92af7f5901bd944e385e7fdbe8696b2c911ed776 (diff)
downloadrtmux-77f582ff137808cc3743ad545f63422cc8e71a71.tar.gz
rtmux-77f582ff137808cc3743ad545f63422cc8e71a71.tar.bz2
rtmux-77f582ff137808cc3743ad545f63422cc8e71a71.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-choose-buffer.c')
-rw-r--r--cmd-choose-buffer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
index 18d28345..6b146fad 100644
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -75,19 +75,20 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
action = xstrdup("paste-buffer -b '%%'");
idx = 0;
- while ((pb = paste_walk_stack(&idx)) != NULL) {
+ pb = NULL;
+ while ((pb = paste_walk(pb)) != NULL) {
cdata = window_choose_data_create(TREE_OTHER, c, c->session);
- cdata->idx = idx - 1;
+ cdata->idx = idx;
cdata->ft_template = xstrdup(template);
- format_add(cdata->ft, "line", "%u", idx - 1);
format_paste_buffer(cdata->ft, pb, utf8flag);
- xasprintf(&action_data, "%u", idx - 1);
+ xasprintf(&action_data, "%s", pb->name);
cdata->command = cmd_template_replace(action, action_data, 1);
free(action_data);
window_choose_add(wl->window->active, cdata);
+ idx++;
}
free(action);