From: Khaled Hosny <khaledhosny@eglug.org>
Date: Sat, 22 Dec 2018 08:48:05 +0000 (+0200)
Subject: Fix previous commit
X-Git-Tag: emacs-27.0.90~2671^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47d1cdc2a5522142fcee226f05038601bffcbd41;p=emacs.git

Fix previous commit
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 43a3e46e578..ba905ed4639 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2949,11 +2949,14 @@ ftfont_shape (Lisp_Object lgstring)
   else
 #endif  /* HAVE_HARFBUZZ */
     {
+#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
       OTF *otf = ftfont_get_otf (ftfont_info);
 
       return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face,
 				  otf, &ftfont_info->matrix);
+#endif  /* defined HAVE_M17N_FLT && defined HAVE_LIBOTF */
     }
+  return make_fixnum (0);
 }
 
 #endif /* (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || defined HAVE_HARFBUZZ */