# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1203213686 0
# Node ID da78ada8c4916b5c71d1c5f2e3248ccd0401ac35
# Parent  0035f4b77d146de8dda9ba05ce4a2b53639f3a25
(prepare_face_for_display): Use display_info->font->fid
for GCs.
(Finternal_set_font_selection_order): Call font_update_sort_order
only when enable_font_backend is set.
(realize_x_face): Set face->font_info to that of default face only
when enable_font_backend is set.

diff -r 0035f4b77d14 -r da78ada8c491 src/xfaces.c
--- a/src/xfaces.c	Sun Feb 17 00:30:06 2008 +0000
+++ b/src/xfaces.c	Sun Feb 17 02:01:26 2008 +0000
@@ -5605,6 +5605,11 @@
       if (face->font)
 	{
 #ifdef HAVE_X_WINDOWS
+#ifdef USE_FONT_BACKEND
+	  if (enable_font_backend)
+	    xgcv.font = FRAME_X_DISPLAY_INFO (f)->font->fid;
+	  else
+#endif
 	  xgcv.font = face->font->fid;
 #endif
 #ifdef WINDOWSNT
@@ -6710,7 +6715,8 @@
     }
 
 #ifdef USE_FONT_BACKEND
-  font_update_sort_order (font_sort_order);
+  if (enable_font_backend)
+    font_update_sort_order (font_sort_order);
 #endif	/* USE_FONT_BACKEND */
 
   return Qnil;
@@ -7658,7 +7664,7 @@
   face->gc = 0;
 #ifdef USE_FONT_BACKEND
   face->extra = NULL;
-#endif
+#endif	/* USE_FONT_BACKEND */
 
   /* Don't try to free the colors copied bitwise from BASE_FACE.  */
   face->colors_copied_bitwise_p = 1;
@@ -7720,7 +7726,8 @@
       face->font = default_face->font;
       face->font_info_id = default_face->font_info_id;
 #ifdef USE_FONT_BACKEND
-      face->font_info = default_face->font_info;
+      if (enable_font_backend)
+	face->font_info = default_face->font_info;
 #endif	/* USE_FONT_BACKEND */
       face->font_name = default_face->font_name;
       face->fontset