mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-10 21:50:37 -08:00
Adapt w32 console to tty-child-frame changes
* src/w32console.c (w32con_write_glyphs): Use the glyph's frame, not the root frame, to resolve faces from face IDs.
This commit is contained in:
parent
9b8d1e0add
commit
33586db3d3
1 changed files with 7 additions and 2 deletions
|
|
@ -327,14 +327,19 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
|
|||
{
|
||||
/* Identify a run of glyphs with the same face. */
|
||||
int face_id = string->face_id;
|
||||
/* 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;
|
||||
int n;
|
||||
|
||||
for (n = 1; n < len; ++n)
|
||||
if (string[n].face_id != face_id)
|
||||
if (!(string[n].face_id == face_id
|
||||
&& string[n].frame == face_id_frame))
|
||||
break;
|
||||
|
||||
/* Turn appearance modes of the face of the run on. */
|
||||
char_attr = w32_face_attributes (f, face_id);
|
||||
char_attr = w32_face_attributes (face_id_frame, face_id);
|
||||
|
||||
if (n == len)
|
||||
/* This is the last run. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue