aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-06-21 11:15:04 +0000
committerKenichi Handa2008-06-21 11:15:04 +0000
commit808dd567ef8b88cddf8b2b4eb6f8c3f9c5a3a262 (patch)
treead8e78f7625d1dbf8237355fd53879ab13d35dff /src
parentc60f3aa4429416744dd20162d0ed2f05d5efcc18 (diff)
downloademacs-808dd567ef8b88cddf8b2b4eb6f8c3f9c5a3a262.tar.gz
emacs-808dd567ef8b88cddf8b2b4eb6f8c3f9c5a3a262.zip
(xftfont_open): Handle QCembolden only when FC_EMBOLDEN is defined.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xftfont.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fb583123321..7ee88c21cfc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-06-21 Kenichi Handa <handa@m17n.org>
2
3 * xftfont.c (xftfont_open): Handle QCembolden only when
4 FC_EMBOLDEN is defined.
5
12008-06-21 Andreas Schwab <schwab@suse.de> 62008-06-21 Andreas Schwab <schwab@suse.de>
2 7
3 * Makefile.in (witness-emacs): Use ../lisp, not $(lispsource). 8 * Makefile.in (witness-emacs): Use ../lisp, not $(lispsource).
diff --git a/src/xftfont.c b/src/xftfont.c
index aa6c270e647..c6aab049b4c 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -257,8 +257,10 @@ xftfont_open (f, entity, pixel_size)
257 if (INTEGERP (val)) 257 if (INTEGERP (val))
258 FcPatternAddInteger (pat, FC_RGBA, XINT (val)); 258 FcPatternAddInteger (pat, FC_RGBA, XINT (val));
259 } 259 }
260#ifdef FC_EMBOLDEN
260 else if (EQ (key, QCembolden)) 261 else if (EQ (key, QCembolden))
261 FcPatternAddBool (pat, FC_EMBOLDEN, NILP (val) ? FcFalse : FcTrue); 262 FcPatternAddBool (pat, FC_EMBOLDEN, NILP (val) ? FcFalse : FcTrue);
263#endif
262 } 264 }
263 FcConfigSubstitute (NULL, pat, FcMatchPattern); 265 FcConfigSubstitute (NULL, pat, FcMatchPattern);
264 266