From: Daniel Martín <mardani29@yahoo.es>
Date: Fri, 5 Nov 2021 22:24:27 +0000 (+0100)
Subject: Fix GNUstep build (ns_compute_glyph_string_overhangs)
X-Git-Tag: emacs-29.0.90~3671^2~219
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0970684011962a7bda6b5b27578f2877dcfc914d;p=emacs.git

Fix GNUstep build (ns_compute_glyph_string_overhangs)

* src/nsterm.m (ns_compute_glyph_string_overhangs): Declare the font
variable so that it's in scope for the GNUstep code.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index f3dd0d791ca..54989a23735 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2849,12 +2849,13 @@ ns_compute_glyph_string_overhangs (struct glyph_string *s)
      External (RIF); compute left/right overhang of whole string and set in s
    -------------------------------------------------------------------------- */
 {
+  struct font *font = s->font;
+
   if (s->char2b)
     {
       struct font_metrics metrics;
       if (s->first_glyph->type == CHAR_GLYPH && !s->font_not_found_p)
         {
-          struct font *font = s->font;
           font->driver->text_extents (font, s->char2b, s->nchars, &metrics);
           s->left_overhang = -metrics.lbearing;
           s->right_overhang