From a0f3999ce7b6df32324b493fa3c8007de93d2c48 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 12 Nov 2015 11:07:10 +0000
Subject: Remove the mouse_utf8_flag format as well.

---
 format.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 847ba08a..f799dfb5 100644
--- a/format.c
+++ b/format.c
@@ -1138,8 +1138,6 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 	    !!(wp->base.mode & MODE_MOUSE_STANDARD));
 	format_add(ft, "mouse_button_flag", "%d",
 	    !!(wp->base.mode & MODE_MOUSE_BUTTON));
-	format_add(ft, "mouse_utf8_flag", "%d",
-	    !!(wp->base.mode & MODE_MOUSE_UTF8));
 
 	format_add_cb(ft, "pane_tabs", format_cb_pane_tabs);
 }
-- 
cgit 


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).

---
 format.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index f799dfb5..bcac7934 100644
--- a/format.c
+++ b/format.c
@@ -1144,8 +1144,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 
 /* Set default format keys for paste buffer. */
 void
-format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
-    int utf8flag)
+format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
 {
 	size_t	 bufsize;
 	char	*s;
@@ -1154,7 +1153,7 @@ format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
 	format_add(ft, "buffer_size", "%zu", bufsize);
 	format_add(ft, "buffer_name", "%s", paste_buffer_name(pb));
 
-	s = paste_make_sample(pb, utf8flag);
+	s = paste_make_sample(pb);
 	format_add(ft, "buffer_sample", "%s", s);
 	free(s);
 }
-- 
cgit