(display_line): While checking line continuation, pay attention to a

padding glyph.

2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b26fb26f51c..20153803848 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-06  Kenichi Handa  <handa@etl.go.jp>
+
+        * term.c (encode_terminal_code): Change the way to check if
+        terminal coding does any conversion.
+        (append_glyph): Set glyph->pixel_width correctly.
+
+        * xdisp.c (display_line): While checking line continuation, pay
+        attention to a padding glyph.
+
 2000-06-05  Gerd Moellmann  <gerd@gnu.org>
 
         * xdisp.c (redisplay_window): Always use set_buffer_internal_1.
diff --git a/src/xdisp.c b/src/xdisp.c
index 6f2c6273115..3920510a5df 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11319,6 +11319,8 @@ display_line (it)
           for (i = 0; i < nglyphs; ++i, x = new_x)
             {
               glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
+              if (CHAR_GLYPH_PADDING_P (*glyph))
+                continue;
               new_x = x + glyph->pixel_width;
 
               if (/* Lines are continued.  */