[Emacs-diffs] Changes to emacs/src/xfaces.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/02/17 02:01:26

Index: xfaces.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfaces.c,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- xfaces.c    8 Feb 2008 16:24:45 -0000       1.376
+++ xfaces.c    17 Feb 2008 02:01:26 -0000      1.377
@@ -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,6 +6715,7 @@
     }
 
 #ifdef USE_FONT_BACKEND
+  if (enable_font_backend)
   font_update_sort_order (font_sort_order);
 #endif /* USE_FONT_BACKEND */
 
@@ -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,6 +7726,7 @@
       face->font = default_face->font;
       face->font_info_id = default_face->font_info_id;
 #ifdef USE_FONT_BACKEND
+      if (enable_font_backend)
       face->font_info = default_face->font_info;
 #endif /* USE_FONT_BACKEND */
       face->font_name = default_face->font_name;