Merge branch 'obsd-master'

Conflicts:
	Makefile
	grid-utf8.c

1 files changed, 0 insertions, 1 deletions

diff --git a/format.c b/format.c
index 19f322ae..0e4e8733 100644
--- a/format.c
+++ b/format.c
@@ -370,7 +370,6 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
 	for (i = 0; i < gd->hsize; i++) {
 		gl = &gd->linedata[i];
 		size += gl->cellsize * sizeof *gl->celldata;
-		size += gl->utf8size * sizeof *gl->utf8data;
 	}
 	size += gd->hsize * sizeof *gd->linedata;