From d56176114c8c9226a43db4bf68df562486e454ed Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 8 Aug 2011 10:49:34 -0400
Subject: Don't lose extra font info when using the Fontconfig font cache.

* src/ftfont.c (ftfont_pattern_entity): Copy the extras argument to
the font entity extracted from the cache.

Fixes: debbugs:8109
---
 src/ftfont.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ftfont.c')

diff --git a/src/ftfont.c b/src/ftfont.c
index 4e313a89021..5c98073057c 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -214,6 +214,10 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
 
       for (i = 0; i < FONT_OBJLIST_INDEX; i++)
 	ASET (val, i, AREF (entity, i));
+
+      ASET (val, FONT_EXTRA_INDEX, Fcopy_sequence (extra));
+      font_put_extra (val, QCfont_entity, key);
+
       return val;
     }
   entity = font_make_entity ();
-- 
cgit v1.2.1