From 2fe1378d3a5bf867895df2344f9f7dbf6d7b88a7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 4 Dec 2025 06:02:27 +0000
Subject: [PATCH 1/2] Allow characters to be combined in either order, reported
 by Jake Stewart in GitHub issue 4726.

---
 screen-write.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/screen-write.c b/screen-write.c
index 43afb50d..39c15b39 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -2057,6 +2057,8 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 		case HANGULJAMO_STATE_NOT_HANGULJAMO:
 			if (utf8_should_combine(&last.data, ud))
 				force_wide = 1;
+			else if (utf8_should_combine(ud, &last.data))
+                               force_wide = 1;
 			else if (!utf8_has_zwj(&last.data))
 				return (0);
 			break;

From 1f2210a3cec0d3d6e912b31d369bcc5cd62e7046 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 4 Dec 2025 06:04:21 +0000
Subject: [PATCH 2/2] Add a missing skin tone, from Jake Stewart in GitHub
 issue 4736.

---
 utf8-combined.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utf8-combined.c b/utf8-combined.c
index 635ae92c..1eee3b82 100644
--- a/utf8-combined.c
+++ b/utf8-combined.c
@@ -122,6 +122,7 @@ utf8_should_combine(const struct utf8_data *with, const struct utf8_data *add)
 	case 0x1F47C:
 	case 0x1F481:
 	case 0x1F482:
+	case 0x1F483:
 	case 0x1F485:
 	case 0x1F486:
 	case 0x1F487: