Commit d5617611 authored by Chong Yidong's avatar Chong Yidong
Browse files

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
parent 0b4946c4
2011-08-08 Chong Yidong <cyd@stupidchicken.com>
* ftfont.c (ftfont_pattern_entity): Copy the extras argument to
the font entity extracted from the cache (Bug#8109).
2011-08-07 Chong Yidong <cyd@stupidchicken.com>
* composite.c (autocmp_chars): Don't reset point. That is done by
......
......@@ -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 ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment