diff src/dispextern.h @ 83116:6ae3d2810507

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-262 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-265 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-266 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-267 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-156

--- a/src/dispextern.h	Thu Apr 29 20:45:02 2004 +0000
+++ b/src/dispextern.h	Sat May 01 19:23:22 2004 +0000
@@ -1923,9 +1923,6 @@
      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;
@@ -1992,6 +1989,10 @@
      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;