Mercurial > emacs
comparison src/xterm.c @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Jul 2006 08:59:39 +0000 |
parents | e33114b32ce5 9ffb5cb61a66 |
children | 66074f6b42c3 |
comparison
equal
deleted
inserted
replaced
90518:64c755511769 | 90519:138ce2701550 |
---|---|
11228 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) | 11228 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) |
11229 xfree (dpyinfo->font_table[i].full_name); | 11229 xfree (dpyinfo->font_table[i].full_name); |
11230 xfree (dpyinfo->font_table[i].name); | 11230 xfree (dpyinfo->font_table[i].name); |
11231 } | 11231 } |
11232 | 11232 |
11233 if (dpyinfo->font_table->font_encoder) | 11233 if (dpyinfo->font_table) |
11234 xfree (dpyinfo->font_table->font_encoder); | 11234 { |
11235 | 11235 if (dpyinfo->font_table->font_encoder) |
11236 xfree (dpyinfo->font_table); | 11236 xfree (dpyinfo->font_table->font_encoder); |
11237 xfree (dpyinfo->x_id_name); | 11237 xfree (dpyinfo->font_table); |
11238 xfree (dpyinfo->color_cells); | 11238 } |
11239 if (dpyinfo->x_id_name) | |
11240 xfree (dpyinfo->x_id_name); | |
11241 if (dpyinfo->color_cells) | |
11242 xfree (dpyinfo->color_cells); | |
11239 xfree (dpyinfo); | 11243 xfree (dpyinfo); |
11240 } | 11244 } |
11241 | 11245 |
11242 #ifdef USE_X_TOOLKIT | 11246 #ifdef USE_X_TOOLKIT |
11243 | 11247 |