From 1b86f520ea1620628e569ea833c7b13306c18a4e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 12 Nov 2015 11:09:11 +0000
Subject: Nuke the utf8 and status-utf8 options and make tmux only a UTF-8
 terminal. We still support non-UTF-8 terminals outside tmux, but inside it is
 always UTF-8 (as when the utf8 and status-utf8 options were on).

---
 cmd-choose-buffer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'cmd-choose-buffer.c')

diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
index e790de6b..dbb20fc4 100644
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -51,7 +51,6 @@ 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_find_client(cmdq, NULL, 1)) == NULL) {
 		cmdq_error(cmdq, "no client available");
@@ -63,7 +62,6 @@ 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(NULL) == NULL)
 		return (CMD_RETURN_NORMAL);
@@ -83,7 +81,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		cdata->idx = idx;
 
 		cdata->ft_template = xstrdup(template);
-		format_defaults_paste_buffer(cdata->ft, pb, utf8flag);
+		format_defaults_paste_buffer(cdata->ft, pb);
 
 		xasprintf(&action_data, "%s", paste_buffer_name(pb));
 		cdata->command = cmd_template_replace(action, action_data, 1);
-- 
cgit