diff options
| author | Kenichi Handa <handa@m17n.org> | 2012-02-02 18:07:29 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2012-02-02 18:07:29 +0900 |
| commit | c5d3843c34587a1584b5ebcf3a693cbfe74bb5c3 (patch) | |
| tree | 55ddf541f7aa7d1c2341f3317ee6b3e9ef6bf4e3 /src/xdisp.c | |
| parent | 159462d4d179b280c6e68775bbf0630c3317c486 (diff) | |
| download | emacs-c5d3843c34587a1584b5ebcf3a693cbfe74bb5c3.tar.gz | |
Fix previous change for Bug#6988.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 1 insertions, 5 deletions
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) |