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/xfont.c | |
| 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/xfont.c')
| -rw-r--r-- | src/xfont.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/xfont.c b/src/xfont.c index 83ef604d5cd..d4d6ee7c10f 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -806,7 +806,6 @@ xfont_open (struct frame *f, Lisp_Object entity, int pixel_size) ASET (font_object, FONT_FILE_INDEX, Qnil); ASET (font_object, FONT_FORMAT_INDEX, Qx); font = XFONT_OBJECT (font_object); - font->frame = f; ((struct xfont_info *) font)->xfont = xfont; ((struct xfont_info *) font)->display = FRAME_X_DISPLAY (f); font->pixel_size = pixel_size; |