(IT_write_glyphs): Compute the glyph face from str->face_id.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d5bdb44aed5e55cb2ead44fd06302ae87be9cd2..12a82867400ebce4387948668a985d9840c15bf3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * msdos.c (IT_write_glyphs): Compute the glyph face from
+       str->face_id.
+
 2000-12-18  Kenichi Handa  <handa@etl.go.jp>
 
        * process.c (read_process_output): Don't run a filter if the code

diff --git a/src/msdos.c b/src/msdos.c
index 1c4e8409ed842faa54128c82363b265359a30951..8466d6ba4ca6628f925a2d6a9a37cbdad2f0209e 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -999,6 +999,9 @@ IT_write_glyphs (struct glyph *str, int str_len)
          register GLYPH g = GLYPH_FROM_CHAR_GLYPH (*str);
          int glyph_not_in_table = 0;
 
+         /* If g is negative, it means we have a multibyte character
+            in *str.  That's what GLYPH_FROM_CHAR_GLYPH returns for
+            multibyte characters.  */
          if (g < 0 || g >= tlen)
            {
              /* This glyph doesn't have an entry in Vglyph_table.  */
@@ -1034,7 +1037,7 @@ IT_write_glyphs (struct glyph *str, int str_len)
 
          /* If the face of this glyph is different from the current
             screen face, update the screen attribute byte.  */
-         cf = FAST_GLYPH_FACE (g);
+         cf = str->face_id;
          if (cf != screen_face)
            IT_set_face (cf);   /* handles invalid faces gracefully */