--- emacs/src/xfaces.c.orig	2005-12-03 20:58:39.000000000 -0800
+++ emacs/src/xfaces.c	2005-12-04 00:00:16.000000000 -0800
@@ -7177,6 +7177,10 @@
     {
       bcopy (base_face, face, sizeof *face);
       face->gc = 0;
+#ifdef HAVE_XFT
+      /* http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-07/msg00359.html */
+      face->xft_draw = NULL;
+#endif
 
       /* Don't try to free the colors copied bitwise from BASE_FACE.  */
       face->colors_copied_bitwise_p = 1;