From: Alan Third <alan@idiocy.org>
Date: Sun, 11 Oct 2020 19:46:07 +0000 (+0100)
Subject: Fix GNUstep build
X-Git-Tag: emacs-28.0.90~5673
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db7b4dbe946e09d0bcb211aff446ba72feab3b47;p=emacs.git

Fix GNUstep build

Fix mistakes made when removing Cocoa code from nsfont.m.

* src/nsfont.m (nsfont_draw): Remove spurious #ifdef.
(ns_uni_to_glyphs): The #if/#endif was removed from this code, but the
code itself not removed.  Remove it now.
---

diff --git a/src/nsfont.m b/src/nsfont.m
index d1543ec69ce..378a6408401 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1089,7 +1089,6 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
               : FRAME_BACKGROUND_COLOR (s->f)));
 
   /* render under GNUstep using DPS */
-#ifdef NS_IMPL_GNUSTEP
   {
     NSGraphicsContext *context = GSCurrentContext ();
 
@@ -1162,10 +1161,6 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block)
     for (i = 0; i < 0x100; i++, glyphs++)
       {
         g = unichars[i];
-        g = glyphStorage->cglyphs[i];
-        /* TODO: is this a good check?  Maybe need to use coveredChars.  */
-        if (g > numGlyphs || g == NSNullGlyph)
-          g = INVALID_GLYPH; /* Hopefully unused...  */
         *glyphs = g;
       }
   }