martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display of reordered Arabic text

Browse Source 
* src/xdisp.c (compute_stop_pos): Fix a year-old thinko in
handling auto-composed characters.  It was introduced as part
of solving bug#62780, which optimized the search for composable
characters.  (Bug#69384)
This commit is contained in:
Eli Zaretskii
2024-02-26 19:26:04 +02:00
parent 1687adcb5c
commit 76fa7f1f2f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xdisp.c
View File

@@ -4345,10 +4345,7 @@ compute_stop_pos (struct it *it)
}
}
if (it->cmp_it.id < 0
&& (STRINGP (it->string)
|| ((!it->bidi_p || it->bidi_it.scan_dir >= 0)
&& it->cmp_it.stop_pos <= IT_CHARPOS (*it))))
if (it->cmp_it.id < 0)
{
ptrdiff_t stoppos = it->end_charpos;
@@ -4357,7 +4354,9 @@ compute_stop_pos (struct it *it)
characters to that position. */
if (it->bidi_p && it->bidi_it.scan_dir < 0)
stoppos = -1;
else if (cmp_limit_pos > 0)
else if (!STRINGP (it->string)
&& it->cmp_it.stop_pos <= IT_CHARPOS (*it)
&& cmp_limit_pos > 0)
stoppos = cmp_limit_pos;
/* Force composition_compute_stop_pos avoid the costly search
for static compositions, since those were already found by