mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 21:50:37 -08:00
Code Issues Projects Releases Wiki Activity

Do not record a font-entity in the property of font-object.

Browse source
This commit is contained in:
Kenichi Handa 2010-07-14 12:40:47 +09:00
parent 01faa93498
commit f6c1c771de
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-07-14 Kenichi Handa <handa@m17n.org>
* font.c (font_open_entity): Cancel previous change.
(Ffont_get): Don't check FONT_ENTITY_INDEX of a font-object.
2010-07-13 Dan Nicolaescu <dann@ics.uci.edu>
Remove subprocesses #ifdefs from term.c.

17
src/font.c
View file

@ -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);