From: Kenichi Handa <handa@m17n.org>
Date: Tue, 17 Apr 2007 08:14:08 +0000 (+0000)
Subject: (face_for_font): Check also face->font==font->font.font.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~548
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0b61ddb639b36dbdfe403d61732e69df9853cf5;p=emacs.git

(face_for_font): Check also face->font==font->font.font.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 384c299791c..4a404f2008c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6087,6 +6087,7 @@ face_for_font (f, font, base_face)
       if (face->ascii_face == face)
 	continue;
       if (face->ascii_face == base_face
+	  && face->font == font->font.font
 	  && face->font_info == (struct font_info *) font)
 	return face->id;
     }