aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2009-06-26 06:16:07 +0000
committerKenichi Handa2009-06-26 06:16:07 +0000
commit42d4a64f783cfff5dc7fac39b7909b633034ea00 (patch)
tree648a712d65add0fd56fadedece661df0d3fec2c7
parent930fe55bb0c0b329faa2b6228ecccd898bb3cf74 (diff)
downloademacs-42d4a64f783cfff5dc7fac39b7909b633034ea00.tar.gz
emacs-42d4a64f783cfff5dc7fac39b7909b633034ea00.zip
(get_adstyle_property): Call font_intern_prop with 1 as
the arg FORCE_SYMBOL.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/ftfont.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 77345b7fafe..c1511e9c243 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-06-26 Peter Jolly <peter@jollys.org> (tiny change)
2
3 * ftfont.c (get_adstyle_property): Call font_intern_prop with 1 as
4 the arg FORCE_SYMBOL.
5
12009-06-25 Kenichi Handa <handa@m17n.org> 62009-06-25 Kenichi Handa <handa@m17n.org>
2 7
3 * fontset.c (fontset_find_font): When a usable rfont_def is found 8 * fontset.c (fontset_find_font): When a usable rfont_def is found
diff --git a/src/ftfont.c b/src/ftfont.c
index 70c1797dce0..789e6a7f685 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -177,7 +177,7 @@ get_adstyle_property (FcPattern *p)
177 || xstrcasecmp (str, "Oblique") == 0 177 || xstrcasecmp (str, "Oblique") == 0
178 || xstrcasecmp (str, "Italic") == 0) 178 || xstrcasecmp (str, "Italic") == 0)
179 return Qnil; 179 return Qnil;
180 adstyle = font_intern_prop (str, end - str, 0); 180 adstyle = font_intern_prop (str, end - str, 1);
181 if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0) 181 if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0)
182 return Qnil; 182 return Qnil;
183 return adstyle; 183 return adstyle;