Merge branch 'master' into feature-floating-window-panes

This commit is contained in:
Michael Grant
2025-12-06 21:14:38 +00:00
committed by GitHub
24 changed files with 249 additions and 151 deletions

View File

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