diff options
| author | Kenichi Handa <handa@etlken> | 2010-07-14 12:40:47 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-07-14 12:40:47 +0900 |
| commit | f6c1c771dee561ddc00a114d17c44d8edeaf2f77 (patch) | |
| tree | 26fdbd393199c71a4cb31dd9799e057393487970 /src/font.c | |
| parent | 01faa93498c3f0430821a0302911422e916fd6de (diff) | |
| download | emacs-f6c1c771dee561ddc00a114d17c44d8edeaf2f77.tar.gz emacs-f6c1c771dee561ddc00a114d17c44d8edeaf2f77.tar.bz2 emacs-f6c1c771dee561ddc00a114d17c44d8edeaf2f77.zip | |
Do not record a font-entity in the property of font-object.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/font.c b/src/font.c index c72453d6702..cb3e9c5d326 100644 --- a/src/font.c +++ b/src/font.c @@ -3005,7 +3005,6 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size) return Qnil; ASET (entity, FONT_OBJLIST_INDEX, Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX))); - ASET (font_object, FONT_ENTITY_INDEX, entity); num_fonts++; font = XFONT_OBJECT (font_object); @@ -4131,20 +4130,12 @@ Layout tags. */) if (NILP (val) && EQ (key, QCotf) && FONT_OBJECT_P (font)) { struct font *fontp = XFONT_OBJECT (font); - Lisp_Object entity = AREF (font, FONT_ENTITY_INDEX); - val = Fassq (key, AREF (entity, FONT_EXTRA_INDEX)); - if (NILP (val)) - { - if (fontp->driver->otf_capability) - val = fontp->driver->otf_capability (fontp); - else - val = Fcons (Qnil, Qnil); - font_put_extra (font, QCotf, val); - font_put_extra (entity, QCotf, val); - } + if (fontp->driver->otf_capability) + val = fontp->driver->otf_capability (fontp); else - val = Fcdr (val); + val = Fcons (Qnil, Qnil); + font_put_extra (font, QCotf, val); } else val = Fcdr (val); |