From: Kenichi Handa <handa@etlken>
Date: Wed, 14 Jul 2010 03:40:47 +0000 (+0900)
Subject: Do not record a font-entity in the property of font-object.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~58
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6c1c771dee561ddc00a114d17c44d8edeaf2f77;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 65d71cda7aa..4fe34cb5944 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
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);