circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-12-21 06:46:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-12-04 08:01:07 +00:00
parent 796539c60b 1f2210a3ce
commit 1bcd360dfe
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
screen-write.c
View File

@@ -2152,6 +2152,8 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
case HANGULJAMO_STATE_NOT_HANGULJAMO: case HANGULJAMO_STATE_NOT_HANGULJAMO:
if (utf8_should_combine(&last.data, ud)) if (utf8_should_combine(&last.data, ud))
force_wide = 1; force_wide = 1;
else if (utf8_should_combine(ud, &last.data))
force_wide = 1;
else if (!utf8_has_zwj(&last.data)) else if (!utf8_has_zwj(&last.data))
return (0); return (0);
break; break;

1
utf8-combined.c
View File

@@ -122,6 +122,7 @@ utf8_should_combine(const struct utf8_data *with, const struct utf8_data *add)
case 0x1F47C: case 0x1F47C:
case 0x1F481: case 0x1F481:
case 0x1F482: case 0x1F482:
case 0x1F483:
case 0x1F485: case 0x1F485:
case 0x1F486: case 0x1F486:
case 0x1F487: case 0x1F487: