aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-04-24 16:22:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-04-24 16:22:37 +0000
commit1fec0cf5ea0c3fe3be92a49eaee5eef5aafa9c49 (patch)
treed0e0fb139d05e6c616910a907341c3a19f8c3151
parentRevert "term: ignore LTR+RTL markers (U+200E + U+200F)" (diff)
Revert "term: append zero-width grapheme breaking characters to previous cell"
This reverts commit 76503fb86a8b8a6b5c3ce1be87c15a55af38508d.
-rw-r--r--CHANGELOG.md4
-rw-r--r--terminal.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35669f03..1aedf331 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -229,9 +229,9 @@
enabled ([#1947][1947]).
* Reflow of the cursor (active + saved) when at the end of the line
with a pending wrap (LCF set) ([#1954][1954]).
-* Zero-width characters that also are grapheme breaks (e.g. U+200B,
+* ~~Zero-width characters that also are grapheme breaks (e.g. U+200B,
ZERO WIDTH SPACE) being ignored (discarded and never stored in the
- grid) ([#1960][1960]).
+ grid) ([#1960][1960]).~~ (reverted)
* `--server=<FD>` not working on FreeBSD ([#1956][1956]).
* Crash when resetting the terminal and an application had previously
set a custom app ID ([#1963][1963])
diff --git a/terminal.c b/terminal.c
index ae1adb1a..f2d03e77 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4188,7 +4188,7 @@ term_process_and_print_non_ascii(struct terminal *term, char32_t wc)
if (grapheme_clustering) {
/* Check if we're on a grapheme cluster break */
if (utf8proc_grapheme_break_stateful(
- last, wc, &term->vt.grapheme_state) && width > 0)
+ last, wc, &term->vt.grapheme_state))
{
term_reset_grapheme_state(term);
goto out;