Subject: 23.0.60; error in nsfonts.m

From: Austin Frank <[email-masked]>
Date: Sat, 30 Aug 2008 13:32:39 -0400

I'm trying to build emacs from a current CVS checkout on OSX 10.4.11
with the configure option --with-ns.

Build fails because of error in nsfonts.m.  That file references a
variable called gidx, which is not defined in the relevant structure.
The attached patch changes all instances of gidx to x, and allows emacs
to build on my system.

diff --git a/src/nsfont.m b/src/nsfont.m
index f49cd0f..10b1c90 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -904,14 +904,14 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
     int hi, lo;
     char isComposite = 0; /* s->first_glyph->type == COMPOSITE_GLYPH; */
     /* FIXME: composition: no vertical displacement is considered. */
-    t+= s->gidx; /* advance into composition */
-    for (i =0; i<s->nchars - s->gidx; i++, t++)
+    t+= s->x; /* advance into composition */
+    for (i =0; i<s->nchars - s->x; i++, t++)
       {
         hi = (*t & 0xFF00) >> 8;
         lo = *t & 0x00FF;
         if (isComposite)
           {
-            cwidth = s->cmp->offsets[s->gidx++ * 2] - twidth;
+            cwidth = s->cmp->offsets[s->x++ * 2] - twidth;
           }
         else
           {
@@ -1094,13 +1094,13 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
       [col set];
 
     CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y);
-    CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+    CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->x,
                                     advances, len);
 
     if (face->overstrike)
       {
         CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y);
-        CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+        CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->x,
                                         advances, len);
       }

In GNU Emacs 23.0.60.1 (powerpc-apple-darwin8.11.0, X toolkit)
 of 2008-08-29 on malibu.local
Important settings:
  value of $LC_ALL: en_US.UTF-8
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: en_US.UTF-8
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

-- 
Austin Frank
http://aufrank.net
GPG Public Key (D7398C2F): http://aufrank.net/personal.asc