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

padding glyph.

diff --git a/src/ChangeLog b/src/ChangeLog
index b26fb26f51ccd5977dfa9da5ea40796336ac7d31..201538038482a9c45bc3766e1b766b6fe8791232 100644 (file)
--- 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 6f2c6273115dc19c7817cf5dea7b42b59ff01466..3920510a5dfdf5153d7b1f87fe83535781b1e5f3 100644 (file)
--- 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.  */