From fba9ebcc0c6c8e28150f484b9d1f1cb1f588eb9c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Mar 2017 09:02:36 +0000
Subject: [PATCH] When redrawing a combined UTF-8 characters in its existing
 position, need to save and restore the cursor so that the next character goes
 into the right place.

---
 screen-write.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/screen-write.c b/screen-write.c
index 937870f9..d9d37437 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1151,7 +1151,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	struct grid_cell 	 tmp_gc, now_gc;
 	struct tty_ctx		 ttyctx;
 	u_int			 sx = screen_size_x(s), sy = screen_size_y(s);
-	u_int		 	 width = gc->data.width, xx, last;
+	u_int		 	 width = gc->data.width, xx, last, cx, cy;
 	int			 selected, skip = 1;
 
 	/* Ignore padding cells. */
@@ -1163,10 +1163,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 	if (width == 0) {
 		screen_write_collect_flush(ctx, 0);
 		if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {
+			cx = s->cx; cy = s->cy;
 			screen_write_cursormove(ctx, xx, s->cy);
 			screen_write_initctx(ctx, &ttyctx);
 			ttyctx.cell = gc;
 			tty_write(tty_cmd_cell, &ttyctx);
+			s->cx = cx; s->cy = cy;
 		}
 		return;
 	}