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

from the vector of matching entities (Bug#17486).

diff --git a/src/ChangeLog b/src/ChangeLog
index 06377ba257d38f9b3e4d43746eb3ae10be084714..751076f4b8e5f0511609a4a4f77b4ca2a2ab2946 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).

diff --git a/src/font.c b/src/font.c
index 5faf477fa900de3d8a2f13c8e85a029fbe07a28d..b8b81fd3feae3cd6662350040aeaa59e2a85aae9 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -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);