(x_produce_glyphs): Use FRAME_BASELINE_OFFSET.

2 files changed, 10 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac7b00c9e20..ab09ba9f34e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,13 @@
+2003-03-16  Juanma Barranquero  <lektu@terra.es>
+
+        * xdisp.c (x_produce_glyphs): Use FRAME_BASELINE_OFFSET.
+
 2003-03-16  Kim F. Storm  <storm@cua.dk>
 
         The following changes consolidate some of the gui-independent
         parts of the processing and drawing of "glyph strings" from
         xterm.c, w32term.c, and macterm.c into xdisp.c.
-        
+
         * dispextern.h (struct glyph): Reduce face_id member from 22 to
         21 bits (this reduces number of faces from 4M to 2M).
         Replace W32 specific w32_font_type member (2 bits) by generic
@@ -42,7 +46,7 @@
         (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE)
         (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
         New macros for consolidated code.
- 
+
         * xterm.c: Remove consolidated defines and code.
         (x_per_char_metric, x_encode_char)
         (x_compute_glyph_string_overhangs): Adapt to RIF requirements.
@@ -53,7 +57,7 @@
         (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): New macros.
 
         * w32term.h (FRAME_X_OUTPUT, FRAME_X_WINDOW, FRAME_X_DISPLAY)
-        (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): 
+        (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
         New macros for consolidation.
 
         * w32term.c: Remove consolidated defines and code.
diff --git a/src/xdisp.c b/src/xdisp.c
index 56657202c01..77c54ccb0a4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11105,7 +11105,7 @@ redisplay_window (window, just_this_one_p)
           clear_glyph_matrix (w->desired_matrix);
           goto recenter;
         }
-      
+
       /* If centering point failed to make the whole line visible,
          put point at the top instead.  That has to make the whole line
          visible, if it can be done.  */
@@ -17475,7 +17475,7 @@ x_produce_glyphs (it)
               if (font == NULL)
                 {
                   font = FRAME_FONT (it->f);
-                  boff = it->f->output_data.x->baseline_offset;
+                  boff = FRAME_BASELINE_OFFSET (it->f);
                   font_info = NULL;
                 }
               else
@@ -17488,7 +17488,7 @@ x_produce_glyphs (it)
                 }
 
               if (font_info
-                  && (pcm = rif->per_char_metric (font, &char2b, 
+                  && (pcm = rif->per_char_metric (font, &char2b,
                                                   FONT_TYPE_FOR_MULTIBYTE (font, ch))))
                 {
                   width = pcm->width;