github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "vt: pad double-width code points with a zero-white-space"

Browse Source 
This reverts commit 547f57b88d.

A new version of the series was submitted, so it's easier to revert the
old one and add the new one due to the changes invovled.

Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2025-04-26 11:21:14 +02:00
parent ab67c4622c
commit 7eaf91626e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/vt/vt.c
View File

@ -2937,13 +2937,12 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c,
width = 2;
} else if (ucs_is_zero_width(c)) {
prev_c = vc_uniscr_getc(vc, -1);
if (prev_c == 0x200B &&
if (prev_c == ' ' &&
ucs_is_double_width(vc_uniscr_getc(vc, -2))) {
/*
* Let's merge this zero-width code point with
* the preceding double-width code point by
* replacing the existing zero-white-space
* padding.
* replacing the existing whitespace padding.
*/
vc_con_rewind(vc);
} else if (c == 0xfe0f && prev_c != 0) {
@ -3041,11 +3040,7 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c,
tc = conv_uni_to_pc(vc, ' ');
if (tc < 0)
tc = ' ';
/*
* Store a zero-white-space in the Unicode screen given that
* the previous code point is semantically double-width.
*/
next_c = 0x200B;
next_c = ' ';
}
out: