Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2025-12-04 08:01:07 +00:00
2 changed files with 3 additions and 0 deletions

View File

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