diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-26 12:21:18 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-26 12:21:18 +0300 |
| commit | 3cf3987b572f71ee609d73601ccfe785dd4ffd50 (patch) | |
| tree | 5db00ff74a4f7d8d5f5ad9e0b8ddb971e50123b8 | |
| parent | 7a149499f6b6b7789a45752c7bbf1669b69cdd0b (diff) | |
| download | linux-3cf3987b572f71ee609d73601ccfe785dd4ffd50.tar.xz | |
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 <nico@fluxnic.net>
Cc: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/vt/vt.c | 11 |
1 files 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; } } } |