diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-10 07:32:36 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-10 07:32:36 +0400 |
| commit | 24ce6a0214e7b885363990e07dabf2935a8c1e11 (patch) | |
| tree | 3795f80b3441117c4c311cdcf9ae27b1e34e1574 /src/font.c | |
| parent | 2e120be4e9871626734ba8334897488019c00cdb (diff) | |
| download | emacs-24ce6a0214e7b885363990e07dabf2935a8c1e11.tar.gz | |
* dispextern.h (struct face) [HAVE_XFT]: Ifdef 'extra' member.
* font.c (font_done_for_face):
* xface.c (realize_non_ascii_face): Adjust user.
* font.h (struct font_driver): Convert 'prepare_face' to return
void because its return value is never used anyway.
* xfont.c (xfont_prepare_face): Return void.
* xftfont.c (xftfont_prepare_face): Likewise. Use xmalloc.
(xftfont_done_face): Use xfree.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c index b8b81fd3fea..6113e1c3e71 100644 --- a/src/font.c +++ b/src/font.c @@ -3337,7 +3337,6 @@ font_done_for_face (struct frame *f, struct face *face) { if (face->font->driver->done_face) face->font->driver->done_face (f, face); - face->extra = NULL; } |