From: Kenichi Handa <handa@m17n.org>
Date: Fri, 14 Dec 2007 12:52:48 +0000 (+0000)
Subject: (x_check_font) [USE_FONT_BACKEND]: Don't access
X-Git-Tag: emacs-pretest-23.0.90~8295^2~131
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52e42a752dfe11c49fdcbda5c80c8fbb8f5b18e8;p=emacs.git

(x_check_font) [USE_FONT_BACKEND]: Don't access
dpyinfo->font_table.
(x_delete_display) [USE_FONT_BACKEND]: Likewise.
(x_delete_terminal) [USE_FONT_BACKEND]: Likewise
---

diff --git a/src/xterm.c b/src/xterm.c
index 023d0194c59..1d39801a72d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10349,6 +10349,11 @@ x_check_font (f, font)
 
   xassert (font != NULL);
 
+#ifdef USE_FONT_BACKEND
+  if (enable_font_backend)
+    /* Fixme: Perhaps we should check all cached fonts.  */
+    return;
+#endif
   for (i = 0; i < dpyinfo->n_fonts; i++)
     if (dpyinfo->font_table[i].name
 	&& font == dpyinfo->font_table[i].font)
@@ -11592,6 +11597,10 @@ x_delete_display (dpyinfo)
     xim_close_dpy (dpyinfo);
 #endif
 
+#ifdef USE_FONT_BACKEND
+  if (! enable_font_backend)
+    {
+#endif
   /* Free the font names in the font table.  */
   for (i = 0; i < dpyinfo->n_fonts; i++)
     if (dpyinfo->font_table[i].name)
@@ -11607,6 +11616,10 @@ x_delete_display (dpyinfo)
 	xfree (dpyinfo->font_table->font_encoder);
       xfree (dpyinfo->font_table);
     }
+#ifdef USE_FONT_BACKEND
+    }
+#endif
+
   if (dpyinfo->x_id_name)
     xfree (dpyinfo->x_id_name);
   if (dpyinfo->color_cells)
@@ -11716,6 +11729,9 @@ x_delete_terminal (struct terminal *terminal)
     return;
 
   BLOCK_INPUT;
+#ifdef USE_FONT_BACKEND
+  if (! enable_font_backend)
+#endif
   /* Free the fonts in the font table.  */
   for (i = 0; i < dpyinfo->n_fonts; i++)
     if (dpyinfo->font_table[i].name)