[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117126: * font.c (font_matching_entity): Extract fo
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r117126: * font.c (font_matching_entity): Extract font-entity object |
Date: |
Mon, 19 May 2014 07:55:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117126
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-05-19 11:54:39 +0400
message:
* font.c (font_matching_entity): Extract font-entity object
from the vector of matching entities (Bug#17486).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/font.c font.c-20091113204419-o5vbwnq5f7feedwu-8540
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-19 07:49:09 +0000
+++ b/src/ChangeLog 2014-05-19 07:54:39 +0000
@@ -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 <address@hidden>
Assume C99 or later (Bug#17487).
=== modified file 'src/font.c'
--- a/src/font.c 2014-04-05 19:30:36 +0000
+++ b/src/font.c 2014-05-19 07:54:39 +0000
@@ -2803,7 +2803,7 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117126: * font.c (font_matching_entity): Extract font-entity object,
Dmitry Antipov <=