diff options
| author | Kim F. Storm | 2004-04-29 22:36:34 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-04-29 22:36:34 +0000 |
| commit | d956147cecb190296dafd598866fa505dacfeaf8 (patch) | |
| tree | c1d0b918c4b5dd1afdec6d8025db40889ab66588 /src | |
| parent | 60ebfdf3c36549af059140338e2bf00d94d2a9ea (diff) | |
| download | emacs-d956147cecb190296dafd598866fa505dacfeaf8.tar.gz emacs-d956147cecb190296dafd598866fa505dacfeaf8.zip | |
(struct it): Remove member use_default_face.
Add members override_ascent, override_descent, override_boff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 387b92a265c..60282b5110f 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1927,9 +1927,6 @@ struct it | |||
| 1927 | descent/ascent (line-height property). Reset after this glyph. */ | 1927 | descent/ascent (line-height property). Reset after this glyph. */ |
| 1928 | unsigned constrain_row_ascent_descent_p : 1; | 1928 | unsigned constrain_row_ascent_descent_p : 1; |
| 1929 | 1929 | ||
| 1930 | /* If 1, show current glyph in default face. Reset after this glyph. */ | ||
| 1931 | unsigned use_default_face : 1; | ||
| 1932 | |||
| 1933 | /* The ID of the default face to use. One of DEFAULT_FACE_ID, | 1930 | /* The ID of the default face to use. One of DEFAULT_FACE_ID, |
| 1934 | MODE_LINE_FACE_ID, etc, depending on what we are displaying. */ | 1931 | MODE_LINE_FACE_ID, etc, depending on what we are displaying. */ |
| 1935 | int base_face_id; | 1932 | int base_face_id; |
| @@ -1996,6 +1993,10 @@ struct it | |||
| 1996 | only.) */ | 1993 | only.) */ |
| 1997 | int extra_line_spacing; | 1994 | int extra_line_spacing; |
| 1998 | 1995 | ||
| 1996 | /* Override font height information for this glyph. | ||
| 1997 | Used if override_ascent >= 0. Cleared after this glyph. */ | ||
| 1998 | int override_ascent, override_descent, override_boff; | ||
| 1999 | |||
| 1999 | /* If non-null, glyphs are produced in glyph_row with each call to | 2000 | /* If non-null, glyphs are produced in glyph_row with each call to |
| 2000 | produce_glyphs. */ | 2001 | produce_glyphs. */ |
| 2001 | struct glyph_row *glyph_row; | 2002 | struct glyph_row *glyph_row; |