aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2004-04-29 22:36:34 +0000
committerKim F. Storm <[email protected]>2004-04-29 22:36:34 +0000
commitd956147cecb190296dafd598866fa505dacfeaf8 (patch)
treec1d0b918c4b5dd1afdec6d8025db40889ab66588
parent60ebfdf3c36549af059140338e2bf00d94d2a9ea (diff)
(struct it): Remove member use_default_face.
Add members override_ascent, override_descent, override_boff.
-rw-r--r--src/dispextern.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 387b92a265..60282b5110 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1927,9 +1927,6 @@ struct it
descent/ascent (line-height property). Reset after this glyph. */
unsigned constrain_row_ascent_descent_p : 1;
- /* If 1, show current glyph in default face. Reset after this glyph. */
- unsigned use_default_face : 1;
-
/* The ID of the default face to use. One of DEFAULT_FACE_ID,
MODE_LINE_FACE_ID, etc, depending on what we are displaying. */
int base_face_id;
@@ -1996,6 +1993,10 @@ struct it
only.) */
int extra_line_spacing;
+ /* Override font height information for this glyph.
+ Used if override_ascent >= 0. Cleared after this glyph. */
+ int override_ascent, override_descent, override_boff;
+
/* If non-null, glyphs are produced in glyph_row with each call to
produce_glyphs. */
struct glyph_row *glyph_row;