Merge changes from master.

This commit is contained in:
Michael Grant
2025-12-08 14:30:57 +00:00
29 changed files with 536 additions and 176 deletions

View File

@@ -2206,6 +2206,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;