* font.c (font_list_entities): Do not add empty vector to font cache.

(font_matching_entity): Likewise.  If matching entity is found, insert
1-item vector with this entity instead of an entity itself (Bug#17125).

2 files changed, 25 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 331da12aa13..9354aa09fa4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-03  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * font.c (font_list_entities): Do not add empty vector to font cache.
+        (font_matching_entity): Likewise.  If matching entity is found, insert
+        1-item vector with this entity instead of an entity itself (Bug#17125).
+
 2014-10-02  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (move_it_by_lines): Call reseat_1 after moving the
diff --git a/src/font.c b/src/font.c
index 470fa1adc11..95b22b2fceb 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2756,22 +2756,21 @@ font_list_entities (struct frame *f, Lisp_Object spec)
           val = XCDR (val);
         else
           {
-            Lisp_Object copy;
-
             val = driver_list->driver->list (f, scratch_font_spec);
-            if (NILP (val))
-              val = zero_vector;
-            else
-              val = Fvconcat (1, &val);
-            copy = copy_font_spec (scratch_font_spec);
-            ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
-            XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache)));
+            if (!NILP (val))
+              {
+                Lisp_Object copy = copy_font_spec (scratch_font_spec);
+
+                val = Fvconcat (1, &val);
+                ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
+                XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache)));
+              }
           }
-        if (ASIZE (val) > 0
+        if (VECTORP (val) && ASIZE (val) > 0
             && (need_filtering
                 || ! NILP (Vface_ignored_fonts)))
           val = font_delete_unmatched (val, need_filtering ? spec : Qnil, size);
-        if (ASIZE (val) > 0)
+        if (VECTORP (val) && ASIZE (val) > 0)
           list = Fcons (val, list);
       }
 
@@ -2807,18 +2806,22 @@ font_matching_entity (struct frame *f, Lisp_Object *attrs, Lisp_Object spec)
         && (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
       {
         Lisp_Object cache = font_get_cache (f, driver_list->driver);
-        Lisp_Object copy;
 
         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);
-            copy = copy_font_spec (work);
-            ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
-            XSETCDR (cache, Fcons (Fcons (copy, entity), XCDR (cache)));
+            if (!NILP (entity))
+              {
+                Lisp_Object copy = copy_font_spec (work);
+                Lisp_Object match = Fvector (1, &entity);
+
+                ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
+                XSETCDR (cache, Fcons (Fcons (copy, match), XCDR (cache)));
+              }
           }
         if (! NILP (entity))
           break;