diff options
| author | Kenichi Handa <handa@gnu.org> | 2014-07-20 00:18:23 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2014-07-20 00:18:23 +0900 |
| commit | bf0d3f76dcfe7881cb3058169b51cf6602fdcdcb (patch) | |
| tree | 4d4c958973053b9c4427272c204b5e21fb03f89c /src/xfaces.c | |
| parent | 31ca1841d2e25983fbcc44302ee9eff0b3a1554a (diff) | |
| download | emacs-bf0d3f76dcfe7881cb3058169b51cf6602fdcdcb.tar.gz | |
2014-07-19 Kenichi Handa <handa@gnu.org>
* xfaces.c (realize_x_face): Call font_load_for_lface with no
mandatory font spec (Bug#17973).
2014-07-19 Stefan Monnier <monnier@iro.umontreal.ca>
* font.c (font_score): Return the worst score if the size of
ENTITY is wrong by more than a factor 2 (Bug#17973).
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 081875f5bea..34895123db9 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5547,7 +5547,7 @@ realize_x_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE]) } if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) attrs[LFACE_FONT_INDEX] - = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]); + = font_load_for_lface (f, attrs, Ffont_spec (0, NULL)); if (FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) { face->font = XFONT_OBJECT (attrs[LFACE_FONT_INDEX]); |