diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:30:14 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-05 14:30:14 -0800 |
| commit | 233ba4d924933cb56129bd7511e6137b7c0b8e3e (patch) | |
| tree | 741044a058b02f007a55e1fdbe8ac480feba0ada /src/ftfont.c | |
| parent | 827b77e90f4f3a86abfc82a07a8319f5f4cfb3d3 (diff) | |
| parent | a60287ff994ec4d07779128f0df5500bed1b3cf9 (diff) | |
| download | emacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.tar.gz | |
Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 576bc42a6ff..db6b29421dc 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1240,7 +1240,11 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); else spacing = FC_PROPORTIONAL; - if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL) + if (spacing != FC_PROPORTIONAL +#ifdef FC_DUAL + && spacing != FC_DUAL +#endif /* FC_DUAL */ + ) font->min_width = font->average_width = font->space_width = (scalable ? ft_face->max_advance_width * size / upEM : ft_face->size->metrics.max_advance >> 6); |