From 3cf3987b572f71ee609d73601ccfe785dd4ffd50 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 26 Apr 2025 11:21:18 +0200 Subject: [PATCH] Revert "vt: support Unicode recomposition" This reverts commit cd6937d42bca46f2143544918e535d6fd22b71b7. 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 Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman --- drivers/tty/vt/vt.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index e3d35c4f9204..5d53feeb5d2b 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -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; } } } -- 2.25.1