Commit 8bb59716 authored by Dmitry Antipov's avatar Dmitry Antipov

* font.c (font_matching_entity): Extract font-entity object

from the vector of matching entities (Bug#17486).
parent 2bcf0551
......@@ -7,6 +7,9 @@
(syms_of_data): DEFSYM it.
* dbusbind.c (xd_signature): Use CHECK_BOOLEAN.
* font.c (font_matching_entity): Extract font-entity object
from the vector of matching entities (Bug#17486).
2014-05-17 Paul Eggert <eggert@cs.ucla.edu>
Assume C99 or later (Bug#17487).
......
......@@ -2803,7 +2803,7 @@ font_matching_entity (struct frame *f, Lisp_Object *attrs, Lisp_Object spec)
ASET (work, FONT_TYPE_INDEX, driver_list->driver->type);
entity = assoc_no_quit (work, XCDR (cache));
if (CONSP (entity))
entity = XCDR (entity);
entity = AREF (XCDR (entity), 0);
else
{
entity = driver_list->driver->match (f, work);
......
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