diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-09 10:25:35 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-09 10:25:35 +0400 |
| commit | 876d043fad0062a85ede5ab4f70c2e7f6d0e77ac (patch) | |
| tree | f4371a2bb4fbc392d9cbf96283373cfbff45d9c6 /src/xftfont.c | |
| parent | 388b22deb41bd53d9294c0e4dcfb6af286252884 (diff) | |
| download | emacs-876d043fad0062a85ede5ab4f70c2e7f6d0e77ac.tar.gz | |
Next minor cleanup of font subsystem.
* font.h (enum font_property_index): Remove FONT_ENTITY_INDEX (no
users) and FONT_FORMAT_INDEX (set by a few font drivers but never
really used).
(FONT_ENTITY_NOT_LOADABLE, FONT_ENTITY_SET_NOT_LOADABLE): Remove;
unused.
* ftfont.h (ftfont_font_format): Remove prototype.
* ftfont.c (ftfont_font_format): Remove; now unused.
(ftfont_open):
* nsfont.m (nsfont_open):
* w32font.c (w32font_open_internal):
* w32uniscribe.c (uniscribe_open):
* xfont.c (xfont_open):
* xftfont.c (xftfont_open): All users changed.
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 1ca3f92b239..9726a3b9911 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -343,8 +343,6 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size) font_object = font_build_object (VECSIZE (struct xftfont_info), Qxft, entity, size); ASET (font_object, FONT_FILE_INDEX, filename); - ASET (font_object, FONT_FORMAT_INDEX, - ftfont_font_format (xftfont->pattern, filename)); font = XFONT_OBJECT (font_object); font->pixel_size = size; font->driver = &xftfont_driver; |