2 files changed, 6 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eebb10fb472..d291f5f4e64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-02  Kenichi Handa  <handa@m17n.org>
 
+        (x_produce_glyphs): Cancel previous change.  If cmp->glyph_len is
+        0, do not call append_composite_glyph.
+
+2012-02-02  Kenichi Handa  <handa@m17n.org>
+
         * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
         NULL (Bug#6988).
         (x_produce_glyphs): If the component of a composition is a null
diff --git a/src/xdisp.c b/src/xdisp.c
index 864517b950c..75ea519e82e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24595,10 +24595,6 @@ x_produce_glyphs (struct it *it)
         it->glyph_row->contains_overlapping_glyphs_p = 1;
 
       it->pixel_width = cmp->pixel_width;
-      if (it->pixel_width == 0)
-        /* We assure that all visible glyphs have at least 1-pixel
-           width.  */
-        it->pixel_width = 1;
       it->ascent = it->phys_ascent = cmp->ascent;
       it->descent = it->phys_descent = cmp->descent;
       if (face->box != FACE_NO_BOX)
@@ -24630,7 +24626,7 @@ x_produce_glyphs (struct it *it)
       if (it->descent < 0)
         it->descent = 0;
 
-      if (it->glyph_row)
+      if (it->glyph_row && cmp->glyph_len > 0)
         append_composite_glyph (it);
     }
   else if (it->what == IT_COMPOSITION)