===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- src/usr.bin/tmux/grid.c	2020/05/27 06:23:23	1.114
+++ src/usr.bin/tmux/grid.c	2020/06/02 20:10:23	1.115
@@ -1,4 +1,4 @@
-/* $OpenBSD: grid.c,v 1.114 2020/05/27 06:23:23 nicm Exp $ */
+/* $OpenBSD: grid.c,v 1.115 2020/06/02 20:10:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -76,7 +76,7 @@
 		return (1);
 	if (gc->attr > 0xff)
 		return (1);
-	if (gc->data.size > 1 || gc->data.width > 1)
+	if (gc->data.size != 1 || gc->data.width != 1)
 		return (1);
 	if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB))
 		return (1);
@@ -570,7 +570,7 @@
 		gce = &gl->celldata[px + i];
 		if (grid_need_extended_cell(gce, gc)) {
 			gee = grid_extended_cell(gl, gce, gc);
-			gee->data = utf8_build_one(s[i], 1);
+			gee->data = utf8_build_one(s[i]);
 		} else
 			grid_store_cell(gce, gc, s[i]);
 	}