2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f3b7c185444..d1343b246ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * xdisp.c (x_produce_glyphs): Avoid possibly-uninitialized var.
+
         * xfns.c (x_real_positions): Mark locals as initialized.
 
         * xmenu.c (xmenu_show): Don't use uninitialized vars.
diff --git a/src/xdisp.c b/src/xdisp.c
index f3928f3b209..e7e8d621a80 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;
+          int c = 0; /* FIXME: Is 0 right here, when cmp->glyph_len == 0?  */
           XChar2b char2b;
           struct font_metrics *pcm;
           int font_not_found_p;