1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Pacify GCC -Wmaybe-uninitialized in xdisp.c

* src/xdisp.c (face_before_or_after_it_pos): Use do-while rather
than while loop to avoid GCC -Wmaybe-uninitialized diagnostic with
charpos.  The loop should always execute at least once anyway.
This commit is contained in:
Paul Eggert 2015-09-21 07:45:31 -07:00
parent aeb17b60f9
commit cf91ea794b

View File

@ -4024,13 +4024,16 @@ face_before_or_after_it_pos (struct it *it, bool before_p)
SAVE_IT (it_copy, *it, it_copy_data);
IT_STRING_CHARPOS (it_copy) = 0;
bidi_init_it (0, 0, FRAME_WINDOW_P (it_copy.f), &it_copy.bidi_it);
while (IT_STRING_CHARPOS (it_copy) != IT_STRING_CHARPOS (*it))
do
{
charpos = IT_STRING_CHARPOS (it_copy);
if (charpos >= SCHARS (it->string))
break;
bidi_move_to_visually_next (&it_copy.bidi_it);
}
while (IT_STRING_CHARPOS (it_copy) != IT_STRING_CHARPOS (*it));
RESTORE_IT (it, it, it_copy_data);
}
else