From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Mon, 19 May 2014 07:54:39 +0000 (+0400)
Subject: * font.c (font_matching_entity): Extract font-entity object
X-Git-Tag: emacs-25.0.90~2640^2~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8bb5971691aa57b9eda5993440316f6bd3d667d1;p=emacs.git

* 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 06377ba257d..751076f4b8e 100644
--- 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 5faf477fa90..b8b81fd3fea 100644
--- 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);