diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
| commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch) | |
| tree | 852fa9fde3126091fa90ee6604097373076772b1 /cmd-choose-buffer.c | |
| parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff) | |
| parent | acef311fe356f408690e9f94727ed63a934b742f (diff) | |
| download | rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2 rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tty-keys.c
Diffstat (limited to 'cmd-choose-buffer.c')
| -rw-r--r-- | cmd-choose-buffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c index d79f6fdc..64edc845 100644 --- a/cmd-choose-buffer.c +++ b/cmd-choose-buffer.c @@ -49,6 +49,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq) char *action, *action_data; const char *template; u_int idx; + int utf8flag; if ((c = cmd_current_client(cmdq)) == NULL) { cmdq_error(cmdq, "no client available"); @@ -60,6 +61,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq) if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL) return (CMD_RETURN_ERROR); + utf8flag = options_get_number(&wl->window->options, "utf8"); if (paste_get_top(&global_buffers) == NULL) return (CMD_RETURN_NORMAL); @@ -79,7 +81,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq) cdata->ft_template = xstrdup(template); format_add(cdata->ft, "line", "%u", idx - 1); - format_paste_buffer(cdata->ft, pb); + format_paste_buffer(cdata->ft, pb, utf8flag); xasprintf(&action_data, "%u", idx - 1); cdata->command = cmd_template_replace(action, action_data, 1); |