diff options
| author | Kenichi Handa | 2007-04-17 08:14:08 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-04-17 08:14:08 +0000 |
| commit | a0b61ddb639b36dbdfe403d61732e69df9853cf5 (patch) | |
| tree | e086315082183f9851f7b8c554bd0277f94af982 /src | |
| parent | c027ffdd854d7e8c5ecdec54445f6b581a9b69fb (diff) | |
| download | emacs-a0b61ddb639b36dbdfe403d61732e69df9853cf5.tar.gz emacs-a0b61ddb639b36dbdfe403d61732e69df9853cf5.zip | |
(face_for_font): Check also face->font==font->font.font.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) | |||
| 6087 | if (face->ascii_face == face) | 6087 | if (face->ascii_face == face) |
| 6088 | continue; | 6088 | continue; |
| 6089 | if (face->ascii_face == base_face | 6089 | if (face->ascii_face == base_face |
| 6090 | && face->font == font->font.font | ||
| 6090 | && face->font_info == (struct font_info *) font) | 6091 | && face->font_info == (struct font_info *) font) |
| 6091 | return face->id; | 6092 | return face->id; |
| 6092 | } | 6093 | } |