diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52a48a87e80..ded7da730fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -35,8 +35,7 @@ * xfns.c (Fx_file_dialog): Rename local to avoid shadowing. - * xdisp.c (x_produce_glyphs): Avoid possibly-uninitialized - var (Bug#8512). + * xdisp.c (x_produce_glyphs): Mark var as initialized (Bug#8512). * xfns.c (x_real_positions): Mark locals as initialized. diff --git a/src/xdisp.c b/src/xdisp.c index e7e8d621a80..3c75a63f4e0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22712,7 +22712,7 @@ x_produce_glyphs (struct it *it) int lbearing, rbearing; int i, width, ascent, descent; int left_padded = 0, right_padded = 0; - int c = 0; /* FIXME: Is 0 right here, when cmp->glyph_len == 0? */ + int c IF_LINT (= 0); /* cmp->glyph_len can't be zero; see Bug#8512 */ XChar2b char2b; struct font_metrics *pcm; int font_not_found_p; |