[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xftfont.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src xftfont.c |
Date: |
Fri, 10 Jul 2009 11:30:37 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/07/10 11:30:37
Modified files:
src : xftfont.c
Log message:
(xftfont_open): Fix typo: FC_RGBA->FC_HINT_STYLE.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.25&r2=1.26
Patches:
Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- xftfont.c 30 Jun 2009 22:07:45 -0000 1.25
+++ xftfont.c 10 Jul 2009 11:30:37 -0000 1.26
@@ -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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src xftfont.c,
Kenichi Handa <=