aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2011-12-08 11:34:09 +0900
committerKenichi Handa2011-12-08 11:34:09 +0900
commit745fff94a04a8a959a0c3cf1a1d2db8531d38576 (patch)
tree8772c77d45a314b8ce88d0d3cdcd1173a9cc012a /src
parent6e44397c4a000df50237a57ef089989e6c4bbc5e (diff)
downloademacs-745fff94a04a8a959a0c3cf1a1d2db8531d38576.tar.gz
emacs-745fff94a04a8a959a0c3cf1a1d2db8531d38576.zip
ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/ftfont.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9ee5ccc1f5e..71b1b3fa82c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-12-08 Kenichi Handa <handa@m17n.org>
2
3 * ftfont.c (get_adstyle_property): Fix previous change
4 (Bug#10233).
5
12011-12-07 Juanma Barranquero <lekktu@gmail.com> 62011-12-07 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * w32.c (init_environment): If no_site_lisp, remove site-lisp 8 * w32.c (init_environment): If no_site_lisp, remove site-lisp
diff --git a/src/ftfont.c b/src/ftfont.c
index ec1a4ca6a78..bab97e44fab 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -166,8 +166,8 @@ get_adstyle_property (FcPattern *p)
166 166
167#ifdef FC_FONTFORMAT 167#ifdef FC_FONTFORMAT
168 if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch) 168 if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch)
169 && (xstrcasecmp ((char *) fcstr, "bdf") != 0 169 && xstrcasecmp ((char *) fcstr, "bdf") != 0
170 || xstrcasecmp ((char *) fcstr, "pcf") != 0)) 170 && xstrcasecmp ((char *) fcstr, "pcf") != 0)
171 /* Not a BDF nor PCF font. */ 171 /* Not a BDF nor PCF font. */
172 return Qnil; 172 return Qnil;
173#endif 173#endif