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/xftfont.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/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index e7eabc47c39..084ca735171 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -411,7 +411,11 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) ascii_printable[i] = ' ' + i; } BLOCK_INPUT; - 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 = xftfont->max_advance_width; |