+2014-11-14 Dmitry Antipov <dmantipov@yandex.ru>
+
+ * xfont.c (xfont_list_pattern): Do not allocate font entity object
+ for each candidate font but attempt to reuse it from previous improper
+ candidate, if any.
+
2014-11-13 Paul Eggert <eggert@cs.ucla.edu>
Avoid undefined behavior in color table hashing.
functions in Vselection_converter_alist (Bug#18911).
(syms_of_nsselect): Remove Vselection_converter_alist.
-(2014-10-31 Dmitry Antipov <dmantipov@yandex.ru>
+2014-10-31 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (copy_font_spec): Redesign to avoid Fcopy_alist
and unnecessary initialization. Adjust comments.
{
char **indices = alloca (sizeof (char *) * num_fonts);
Lisp_Object *props = XVECTOR (xfont_scratch_props)->contents;
- Lisp_Object scripts = Qnil;
+ Lisp_Object scripts = Qnil, entity = Qnil;
for (i = 0; i < ASIZE (xfont_scratch_props); i++)
ASET (xfont_scratch_props, i, Qnil);
for (i = 0; i < num_fonts; i++)
{
ptrdiff_t len;
- Lisp_Object entity;
if (i > 0 && xstrcasecmp (indices[i - 1], indices[i]) == 0)
continue;
- entity = font_make_entity ();
+ if (NILP (entity))
+ entity = font_make_entity ();
len = xfont_decode_coding_xlfd (indices[i], -1, buf);
if (font_parse_xlfd (buf, len, entity) < 0)
continue;
{
if (NILP (script)
|| xfont_chars_supported (chars, NULL, encoding, repertory))
- list = Fcons (entity, list);
+ list = Fcons (entity, list), entity = Qnil;
continue;
}
if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX),
}
if (NILP (script)
|| ! NILP (Fmemq (script, scripts)))
- list = Fcons (entity, list);
+ list = Fcons (entity, list), entity = Qnil;
}
XFreeFontNames (names);
}