# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1151473142 0
# Node ID 32b8f672da38a7fc253233ca9b56e27758e82486
# Parent  fa27e8839f68f748f81ea349b8afdcec99bb6c48
(xftfont_prepare_face): Cancel previous change.
(xftfont_done_face): Likewise.

diff -r fa27e8839f68 -r 32b8f672da38 src/xftfont.c
--- a/src/xftfont.c	Mon Jun 26 04:28:27 2006 +0000
+++ b/src/xftfont.c	Wed Jun 28 05:39:02 2006 +0000
@@ -364,11 +364,14 @@
 {
   struct xftface_info *xftface_info;
 
+#if 0
+  /* This doesn't work if face->ascii_face doesn't use an Xft font. */
   if (face != face->ascii_face)
     {
       face->extra = face->ascii_face->extra;
       return 0;
     }
+#endif
 
   xftface_info = malloc (sizeof (struct xftface_info));
   if (! xftface_info)
@@ -394,9 +397,12 @@
 {
   struct xftface_info *xftface_info;
   
+#if 0
+  /* This doesn't work if face->ascii_face doesn't use an Xft font. */
   if (face != face->ascii_face
       || ! face->extra)
     return;
+#endif
 
   xftface_info = (struct xftface_info *) face->extra;
   BLOCK_INPUT;