# HG changeset patch # User Juanma Barranquero # Date 1047852100 0 # Node ID 9eab4eab96b98211b9772b87417a12143500795b # Parent 50b43913f09c14b21fd56e023016ab948d58edce (x_produce_glyphs): Use FRAME_BASELINE_OFFSET. diff -r 50b43913f09c -r 9eab4eab96b9 src/xdisp.c --- a/src/xdisp.c Sun Mar 16 20:50:57 2003 +0000 +++ b/src/xdisp.c Sun Mar 16 22:01:40 2003 +0000 @@ -11105,7 +11105,7 @@ 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 @@ 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 @@ } 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;