From cf91ea794be50c2d3c572726b1d4e53ab92da506 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Sep 2015 07:45:31 -0700 Subject: [PATCH] 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. --- src/xdisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 34b5ca3cced..0d0bc91efd9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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 -- 2.39.2