===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- src/usr.bin/tmux/grid.c	2020/05/25 09:32:10	1.110
+++ src/usr.bin/tmux/grid.c	2020/05/25 18:19:29	1.111
@@ -1,4 +1,4 @@
-/* $OpenBSD: grid.c,v 1.110 2020/05/25 09:32:10 nicm Exp $ */
+/* $OpenBSD: grid.c,v 1.111 2020/05/25 18:19:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -114,7 +114,7 @@
 	gl->flags |= GRID_LINE_EXTENDED;
 
 	gee = &gl->extddata[gce->offset];
-	gee->data = utf8_map_big(&gc->data);
+	utf8_from_data(&gc->data, &gee->data);
 	gee->attr = gc->attr;
 	gee->flags = flags;
 	gee->fg = gc->fg;
@@ -496,7 +496,7 @@
 			gc->fg = gee->fg;
 			gc->bg = gee->bg;
 			gc->us = gee->us;
-			utf8_get_big(gee->data, &gc->data);
+			utf8_to_data(gee->data, &gc->data);
 		}
 		return;
 	}
@@ -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_set_big(s[i], 1);
+			gee->data = utf8_build_one(s[i], 1);
 		} else
 			grid_store_cell(gce, gc, s[i]);
 	}