(append_glyph): Revert change of 2000-06-06.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ba45719d3fa..654c9f221b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2000-06-06  Gerd Moellmann  <gerd@gnu.org>
 
+        * term.c (append_glyph): Revert change of 2000-06-06.
+
+        * xdisp.c (display_line): Revert change of 2000-06-06.  Treat
+        padding glyph not fitting on line as whole character not
+        fitting on line.
+
         * xterm.c (x_produce_glyphs): Don't xassert `it->descent > 0';
         this isn't true for images with `:ascent 100'.
 
diff --git a/src/term.c b/src/term.c
index d21b78c6b62..5d8e7bb658d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1783,7 +1783,7 @@ append_glyph (it)
        ++i)
     {
       glyph->type = CHAR_GLYPH;
-      glyph->pixel_width = it->pixel_width;
+      glyph->pixel_width = 1;
       glyph->u.ch = it->c;
       glyph->face_id = it->face_id;
       glyph->padding_p = i > 0;