[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master f1baa15: Fix display when a font claims large values of ascen
From: |
Eli Zaretskii |
Subject: |
Re: master f1baa15: Fix display when a font claims large values of ascent and descent |
Date: |
Mon, 08 Jun 2015 21:17:38 +0300 |
> From: Glenn Morris <address@hidden>
> Cc: Eli Zaretskii <address@hidden>
> Date: Mon, 08 Jun 2015 13:44:40 -0400
>
> > + /* Make sure this space glyph has the right ascent and
> > + descent values, or else cursor at end of line will look
> > + funny. */
> > + g = it->glyph_row->glyphs[TEXT_AREA] + n;
> > + struct font *font = face->font ? face->font : FRAME_FONT (it->f);
> > + if (n == 0 || it->glyph_row->height < font->pixel_size)
> > + {
> > + normal_char_ascent_descent (font, -1, &it->ascent, &it->descent);
> > + it->max_ascent = it->ascent;
> > + it->max_descent = it->descent;
> > + /* Make sure compute_line_metrics recomputes the row height. */
> > + it->glyph_row->height = 0;
> > + }
> > +
> > + g->ascent = it->max_ascent;
> > + g->descent = it->max_descent;
> > +
>
> This bit causes a warning in without-x builds, eg
> http://hydra.nixos.org/build/23007744/log/raw
>
> xdisp.c:19210:8: warning: implicit declaration of function
> 'normal_char_ascent_descent' [-Wimplicit-function-declaration]
> normal_char_ascent_descent (font, -1, &it->ascent, &it->descent);
(And will fail during linking if you build with -O0, I presume.)
Thanks, I think I fixed that in 55200b4.