commit 47aec13e12375ed58bd0e84d3cd199d161afc7e3
from: Omar Polo <op@omarpolo.com>
date: Sat Jul 17 21:06:18 2021 UTC

correctly compute the x position on "emojified" lines

commit - 2f524b17f5cc48bb6752037b1c88b684c39a7d2c
commit + 47aec13e12375ed58bd0e84d3cd199d161afc7e3
blob - aad33da1c3ba106216a61b7bd158d76fe593263b
blob + e44c594d77057c75e4d5db6dfb22de0aeda8c60f
--- ui.c
+++ ui.c
@@ -162,7 +162,12 @@ restore_curs_x(struct buffer *buffer)
 
 	buffer->curs_x += x_offset;
 
-	if (vl != NULL) {
+	if (vl == NULL)
+		return;
+
+	if (vl->parent->data != NULL)
+		buffer->curs_x += utf8_swidth_between(vl->parent->line, vl->parent->data);
+	else {
 		prfx = line_prefixes[vl->parent->type].prfx1;
 		buffer->curs_x += utf8_swidth(prfx);
 	}