diff options
| author | Damyan Pepper <damyanp@gmail.com> | 2010-10-13 16:07:28 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-13 16:07:28 +0200 |
| commit | 9fa828240d621736a61f5938f78cc98805fdcf56 (patch) | |
| tree | 799e6075c0e1a467522070c065165b5aeac32f95 /src/w32font.c | |
| parent | 7163badd35f9dc49dc5c0a26d2c037f8d4fb5ee7 (diff) | |
| download | emacs-9fa828240d621736a61f5938f78cc98805fdcf56.tar.gz | |
Fix handling of font properties on Windows (bug#6303).
* src/font.c (font_filter_properties): New function, refactored from
ftfont_filter_properties.
* src/font.h (font_filter_properties): Declare.
* src/ftfont.c (ftfont_filter_properties): Use font_filter_properties.
* src/w32font.c (w32font_booleans, w32font_non_booleans): New variables.
(w32font_filter_properties): New function.
(w32font_driver): Add w32font_filter_properties.
Diffstat (limited to 'src/w32font.c')
| -rw-r--r-- | src/w32font.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/w32font.c b/src/w32font.c index a07762e970f..e38e1a56fb8 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -2446,6 +2446,25 @@ in the font selection dialog. */) return DECODE_SYSTEM (build_string (buf)); } +static const char *w32font_booleans [] = { + NULL, +}; + +static const char *w32font_non_booleans [] = { + ":script", + ":antialias", + ":style", + NULL, +}; + +static void +w32font_filter_properties (font, alist) + Lisp_Object font; + Lisp_Object alist; +{ + font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans); +} + struct font_driver w32font_driver = { 0, /* Qgdi */ @@ -2475,7 +2494,7 @@ struct font_driver w32font_driver = NULL, /* shape */ NULL, /* check */ NULL, /* get_variation_glyphs */ - NULL, /* filter_properties */ + w32font_filter_properties, }; |