From: Po Lu <luangruo@yahoo.com>
Date: Sun, 17 Apr 2022 04:06:52 +0000 (+0000)
Subject: Make sure the ftcr font driver is used on Haiku when Cairo is enabled
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2370^2~485
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=265f4ef70233c4708cbbdeb1850541570c40fdd6;p=emacs.git

Make sure the ftcr font driver is used on Haiku when Cairo is enabled

* src/haikufont.c (syms_of_haikufont): [USE_BE_CAIRO]: Make sure
`ftcr' superseeds `haiku'.
---

diff --git a/src/haikufont.c b/src/haikufont.c
index f2ead5d6c25..4e81e577039 100644
--- a/src/haikufont.c
+++ b/src/haikufont.c
@@ -1096,6 +1096,10 @@ syms_of_haikufont (void)
   DEFSYM (Qko, "ko");
   DEFSYM (Qjp, "jp");
 
+#ifdef USE_BE_CAIRO
+  Fput (Qhaiku, Qfont_driver_superseded_by, Qftcr);
+#endif
+
   font_cache = list (Qnil);
   staticpro (&font_cache);
 }