diff options
| author | Eli Zaretskii | 2024-10-28 15:43:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2024-10-28 15:43:08 +0200 |
| commit | 7aa00fa90d6eb9347034106da10cdbbdc23b3d3a (patch) | |
| tree | 30b9e9f5862aa72444aa5923514515f86ea8d94c | |
| parent | d3f8ed730fa10d7283c6638dc4cc20cabbe4f4bf (diff) | |
| download | emacs-7aa00fa90d6eb9347034106da10cdbbdc23b3d3a.tar.gz emacs-7aa00fa90d6eb9347034106da10cdbbdc23b3d3a.zip | |
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.
| -rw-r--r-- | src/w32console.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/w32console.c b/src/w32console.c index 7393e5b3f6b..cd01fb9de38 100644 --- a/src/w32console.c +++ b/src/w32console.c | |||
| @@ -167,6 +167,7 @@ w32con_clear_end_of_line (struct frame *f, int end) | |||
| 167 | for (i = 0; i < glyphs_len; i++) | 167 | for (i = 0; i < glyphs_len; i++) |
| 168 | { | 168 | { |
| 169 | memcpy (&glyphs[i], &space_glyph, sizeof (struct glyph)); | 169 | memcpy (&glyphs[i], &space_glyph, sizeof (struct glyph)); |
| 170 | glyphs[i].frame = f; | ||
| 170 | } | 171 | } |
| 171 | ceol_initialized = TRUE; | 172 | ceol_initialized = TRUE; |
| 172 | } | 173 | } |
| @@ -330,7 +331,7 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string, | |||
| 330 | /* Since this is called to deliver the frame glyph matrix to the | 331 | /* Since this is called to deliver the frame glyph matrix to the |
| 331 | glass, some of the glyphs might be from a child frame, which | 332 | glass, some of the glyphs might be from a child frame, which |
| 332 | affects the interpretation of face ID. */ | 333 | affects the interpretation of face ID. */ |
| 333 | struct frame *face_id_frame = string->frame ? string->frame : f; | 334 | struct frame *face_id_frame = string->frame; |
| 334 | int n; | 335 | int n; |
| 335 | 336 | ||
| 336 | for (n = 1; n < len; ++n) | 337 | for (n = 1; n < len; ++n) |