diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/alloc.c | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a9672768b48..df145600556 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,5 @@ 2013-12-14 Eli Zaretskii <eliz@gnu.org> - * 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. diff --git a/src/alloc.c b/src/alloc.c index 69681111275..aeda42637cd 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2877,12 +2877,7 @@ cleanup_vector (struct Lisp_Vector *vector) 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. */ |