Commit f23590cc authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fixed a bug with displaying strings padded with blanks.

 src/xdisp.c (set_iterator_to_next): Advance string position
 correctly when padding it with blanks.
parent 34c48e57
2011-06-11 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_iterator_to_next): Advance string position
correctly when padding it with blanks.
2011-06-11 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (next_element_from_buffer): Improve commentary for when
......
......@@ -6305,7 +6305,12 @@ set_iterator_to_next (struct it *it, int reseat_p)
 
case GET_FROM_C_STRING:
/* Current display element of IT is from a C string. */
if (!it->bidi_p)
if (!it->bidi_p
/* If the string position is beyond string_nchars, it means
next_element_from_c_string is padding the string with
blanks, in which case we bypass the bidi iterator,
because it cannot deal with such virtual characters. */
|| IT_CHARPOS (*it) >= it->string_nchars)
{
IT_BYTEPOS (*it) += it->len;
IT_CHARPOS (*it) += 1;
......@@ -6428,7 +6433,13 @@ set_iterator_to_next (struct it *it, int reseat_p)
}
else
{
if (!it->bidi_p)
if (!it->bidi_p
/* If the string position is beyond string_nchars, it
means next_element_from_string is padding the string
with blanks, in which case we bypass the bidi
iterator, because it cannot deal with such virtual
characters. */
|| IT_STRING_CHARPOS (*it) >= it->string_nchars)
{
IT_STRING_BYTEPOS (*it) += it->len;
IT_STRING_CHARPOS (*it) += 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment