diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-13 19:55:23 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-13 19:55:23 +0400 |
| commit | 5035fbc19e2f569674237c61e6ffdd4719e092d5 (patch) | |
| tree | 86e7b51ececff332f6bd3bebd92f389cc4024ce8 /src/macfont.m | |
| parent | b6c888cc7afed65f24c023b8e90b73649f438e14 (diff) | |
| download | emacs-5035fbc19e2f569674237c61e6ffdd4719e092d5.tar.gz | |
* 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.
Diffstat (limited to 'src/macfont.m')
| -rw-r--r-- | src/macfont.m | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/macfont.m b/src/macfont.m index 66833cd1b80..10623eb12fe 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -882,7 +882,6 @@ macfont_descriptor_entity (FontDescriptorRef desc, Lisp_Object extra, CFStringRef name; entity = font_make_entity (); - XFONT_ENTITY (entity)->driver = &macfont_driver; ASET (entity, FONT_TYPE_INDEX, macfont_driver.type); ASET (entity, FONT_REGISTRY_INDEX, Qiso10646_1); @@ -2492,7 +2491,6 @@ macfont_open (struct frame * f, Lisp_Object entity, int pixel_size) ASET (font_object, FONT_FULLNAME_INDEX, AREF (font_object, FONT_NAME_INDEX)); font = XFONT_OBJECT (font_object); - font->frame = f; font->pixel_size = size; font->driver = &macfont_driver; font->encoding_charset = font->repertory_charset = -1; |