From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Nov 2019 16:32:37 +0000 (+0100)
Subject: Handle FC_CHARCELL in xftfont_open
X-Git-Tag: emacs-27.0.90~586
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c29ba034092660e73bce8c6ff459c75ff2c2d72;p=emacs.git

Handle FC_CHARCELL in xftfont_open

* src/xftfont.c (xftfont_open): FC_CHARCELL is apparently an alias
for FC_DUAL used in some east Asian fonts (bug#35079).  Modelled
after a patch suggested by Kenichi Handa.
---

diff --git a/src/xftfont.c b/src/xftfont.c
index e0035808172..fa06d967369 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -211,6 +211,9 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
 #ifdef FC_DUAL
       && spacing != FC_DUAL
 #endif	/* FC_DUAL */
+#ifdef FC_CHARCELL
+      && spacing != FC_CHARCELL
+#endif	/* FC_CHARCELL */
       )
     {
       font->min_width = font->max_width = font->average_width