Remove unneeded workaround from w32console.c

* src/w32console.c (w32con_write_glyphs): Remove unneeded test.
(w32con_clear_end_of_line): Fill in the glyph.frame member.

(cherry picked from commit 7aa00fa90d6eb9347034106da10cdbbdc23b3d3a)

diff --git a/src/w32console.c b/src/w32console.c
index 7393e5b3f6b8e95f6070f784323bc76fdfcbefa5..cd01fb9de38270866a1026917e1c066810e61372 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -167,6 +167,7 @@ w32con_clear_end_of_line (struct frame *f, int end)
       for (i = 0; i < glyphs_len; i++)
         {
          memcpy (&glyphs[i], &space_glyph, sizeof (struct glyph));
+         glyphs[i].frame = f;
         }
       ceol_initialized = TRUE;
     }
@@ -330,7 +331,7 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
       /* Since this is called to deliver the frame glyph matrix to the
         glass, some of the glyphs might be from a child frame, which
         affects the interpretation of face ID.  */
-      struct frame *face_id_frame = string->frame ? string->frame : f;
+      struct frame *face_id_frame = string->frame;
       int n;
 
       for (n = 1; n < len; ++n)