comparison src/dispextern.h @ 83116:6ae3d2810507

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-262 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-266 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-267 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-156
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 01 May 2004 19:23:22 +0000
parents 1a68e4b22355 fa2641411db1
children c5bae78b527c
comparison
equal deleted inserted replaced
83115:141388e31bb7 83116:6ae3d2810507
1921 1921
1922 /* If 1, adjust current glyph so it does not increase current row 1922 /* If 1, adjust current glyph so it does not increase current row
1923 descent/ascent (line-height property). Reset after this glyph. */ 1923 descent/ascent (line-height property). Reset after this glyph. */
1924 unsigned constrain_row_ascent_descent_p : 1; 1924 unsigned constrain_row_ascent_descent_p : 1;
1925 1925
1926 /* If 1, show current glyph in default face. Reset after this glyph. */
1927 unsigned use_default_face : 1;
1928
1929 /* The ID of the default face to use. One of DEFAULT_FACE_ID, 1926 /* The ID of the default face to use. One of DEFAULT_FACE_ID,
1930 MODE_LINE_FACE_ID, etc, depending on what we are displaying. */ 1927 MODE_LINE_FACE_ID, etc, depending on what we are displaying. */
1931 int base_face_id; 1928 int base_face_id;
1932 1929
1933 /* If what == IT_CHARACTER, character and length in bytes. This is 1930 /* If what == IT_CHARACTER, character and length in bytes. This is
1989 int last_visible_y; 1986 int last_visible_y;
1990 1987
1991 /* Additional space in pixels between lines (for window systems 1988 /* Additional space in pixels between lines (for window systems
1992 only.) */ 1989 only.) */
1993 int extra_line_spacing; 1990 int extra_line_spacing;
1991
1992 /* Override font height information for this glyph.
1993 Used if override_ascent >= 0. Cleared after this glyph. */
1994 int override_ascent, override_descent, override_boff;
1994 1995
1995 /* If non-null, glyphs are produced in glyph_row with each call to 1996 /* If non-null, glyphs are produced in glyph_row with each call to
1996 produce_glyphs. */ 1997 produce_glyphs. */
1997 struct glyph_row *glyph_row; 1998 struct glyph_row *glyph_row;
1998 1999