[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Sun, 05 Oct 2003 08:15:40 -0400 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.813 emacs/src/xterm.c:1.814
*** emacs/src/xterm.c:1.813 Sun Oct 5 07:52:46 2003
--- emacs/src/xterm.c Sun Oct 5 08:15:37 2003
***************
*** 10649,10654 ****
--- 10649,10656 ----
x_delete_display (dpyinfo)
struct x_display_info *dpyinfo;
{
+ int i;
+
delete_keyboard_wait_descriptor (dpyinfo->connection);
/* Discard this display from x_display_name_list and x_display_list.
***************
*** 10699,10704 ****
--- 10701,10718 ----
if (dpyinfo->xim)
xim_close_dpy (dpyinfo);
#endif
+
+ /* Free the font names in the font table. */
+ for (i = 0; i < dpyinfo->n_fonts; i++)
+ if (dpyinfo->font_table[i].name)
+ {
+ if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name)
+ xfree (dpyinfo->font_table[i].full_name);
+ xfree (dpyinfo->font_table[i].name);
+ }
+
+ if (dpyinfo->font_table->font_encoder)
+ xfree (dpyinfo->font_table->font_encoder);
xfree (dpyinfo->font_table);
xfree (dpyinfo->x_id_name);