Mercurial > emacs

diff src/xftfont.c @ 90499:32b8f672da38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xftfont_prepare_face): Cancel previous change. (xftfont_done_face): Likewise.
author Kenichi Handa <handa@m17n.org>
date Wed, 28 Jun 2006 05:39:02 +0000
parents 78a820ef12db
children 2cd8e24f656a
line wrap: on
line diff
--- 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;