Mercurial > emacs
changeset 103838:a7805f91abdd
(xftfont_open): Fix typo: FC_RGBA->FC_HINT_STYLE.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 10 Jul 2009 11:30:37 +0000 |
| parents | 28fcad21f68a |
| children | 65b0cbb5b077 |
| files | src/xftfont.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xftfont.c Fri Jul 10 11:30:18 2009 +0000 +++ b/src/xftfont.c Fri Jul 10 11:30:37 2009 +0000 @@ -256,7 +256,7 @@ else if (EQ (key, QChintstyle)) { if (INTEGERP (val)) - FcPatternAddInteger (pat, FC_RGBA, XINT (val)); + FcPatternAddInteger (pat, FC_HINT_STYLE, XINT (val)); } else if (EQ (key, QCrgba)) { @@ -488,9 +488,6 @@ struct xftfont_info *xftfont_info; struct charset *cs = NULL; - if (FONT_ENTITY_P (font)) - return ftfont_driver.has_char (font, c); - if (EQ (AREF (font, FONT_ADSTYLE_INDEX), Qja) && charset_jisx0208 >= 0) cs = CHARSET_FROM_ID (charset_jisx0208); @@ -500,6 +497,8 @@ if (cs) return (ENCODE_CHAR (cs, c) != CHARSET_INVALID_CODE (cs)); + if (FONT_ENTITY_P (font)) + return ftfont_driver.has_char (font, c); xftfont_info = (struct xftfont_info *) XFONT_OBJECT (font); return (XftCharExists (xftfont_info->display, xftfont_info->xftfont, (FcChar32) c) == FcTrue);