From: Kim F. Storm <storm@cua.dk>
Date: Thu, 29 Apr 2004 22:36:34 +0000 (+0000)
Subject: (struct it): Remove member use_default_face.
X-Git-Tag: ttn-vms-21-2-B4~6511
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d956147cecb190296dafd598866fa505dacfeaf8;p=emacs.git

(struct it): Remove member use_default_face.
Add members override_ascent, override_descent, override_boff.
---

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
      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;