# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1083278194 0
# Node ID fa2641411db1e2af7235f013f9d31b0a45122a03
# Parent  d57364949309650a528b8ca0811ed57172a5ba60
(struct it): Remove member use_default_face.
Add members override_ascent, override_descent, override_boff.

diff -r d57364949309 -r fa2641411db1 src/dispextern.h
--- a/src/dispextern.h	Thu Apr 29 22:36:11 2004 +0000
+++ b/src/dispextern.h	Thu Apr 29 22:36:34 2004 +0000
@@ -1927,9 +1927,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;
@@ -1996,6 +1993,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;