mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-15 14:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "vt: support Unicode recomposition"

Browse Source 
This reverts commit cd6937d42b.

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:18 +02:00
parent 7a149499f6
commit 3cf3987b57
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2953,15 +2953,8 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c,
* double-width.
*/
} else {
/* try recomposition */
prev_c = ucs_recompose(prev_c, c);
if (prev_c != 0) {
vc_con_rewind(vc);
c = prev_c;
} else {
/* Otherwise zero-width code points are ignored */
goto out;
}
/* Otherwise zero-width code points are ignored */
goto out;
}
}
}