* alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,

* nsfont.m, w32font.c, xfont.c, xftfont.c: Revert last and
2013-12-12 font-related change to avoid Bug#16128, which
is quite hard to fix without even more substantial changes.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 022d1e5dcbb..aeda42637cd 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2874,22 +2874,10 @@ vector_nbytes (struct Lisp_Vector *v)
 static void
 cleanup_vector (struct Lisp_Vector *vector)
 {
-  if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT))
-    {
-      ptrdiff_t size = vector->header.size & PSEUDOVECTOR_SIZE_MASK;
-      Lisp_Object obj = make_lisp_ptr (vector, Lisp_Vectorlike);
-
-      if (size == FONT_OBJECT_MAX)
-        font_close_object (obj);
-#ifdef HAVE_NS
-      else if (size == FONT_ENTITY_MAX)
-        {
-          struct font_entity *entity = (struct font_entity *) vector;
-          if (entity->driver && entity->driver->free_entity)
-            entity->driver->free_entity (obj);
-        }
-#endif /* HAVE_NS */
-    }
+  if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT)
+      && ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
+          == FONT_OBJECT_MAX))
+    ((struct font *) vector)->driver->close ((struct font *) vector);
 }
 
 /* Reclaim space used by unmarked vectors.  */