[Emacs-diffs] trunk r115520: Revert 2 last commits in src/alloc.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115520
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-14 11:57:53 +0200
message:
  Revert 2 last commits in src/alloc.c.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-14 09:16:10 +0000
+++ b/src/ChangeLog     2013-12-14 09:57:53 +0000
@@ -1,8 +1,5 @@
 2013-12-14  Eli Zaretskii  <address@hidden>
 
-       * alloc.c (cleanup_vector): Don't call the font driver's 'close'
-       method if the 'driver' pointer is NULL.
-
        * fileio.c (Fcopy_file) [WINDOWSNT]: Move most of the
        Windows-specific code to w32.c.  Change error message text to
        match that of Posix platforms.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-12-14 09:18:23 +0000
+++ b/src/alloc.c       2013-12-14 09:57:53 +0000
@@ -2877,12 +2877,7 @@
   if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_FONT)
       && ((vector->header.size & PSEUDOVECTOR_SIZE_MASK)
          == FONT_OBJECT_MAX))
-    {
-      struct font *fnt = (struct font *) vector;
-
-      if (fnt->driver)
-       fnt->driver->close (fnt);
-    }
+    ((struct font *) vector)->driver->close ((struct font *) vector);
 }
 
 /* Reclaim space used by unmarked vectors.  */