Mercurial > emacs
comparison src/xfaces.c @ 83238:223c12363c0c
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-752
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-278
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 06 Jan 2005 15:00:09 +0000 |
parents | 549734260e34 9bde7721ad0f |
children | 3dcba0bc766b |
comparison
equal
deleted
inserted
replaced
83237:4ee39d9428b0 | 83238:223c12363c0c |
---|---|
1072 #ifdef HAVE_X_WINDOWS | 1072 #ifdef HAVE_X_WINDOWS |
1073 XFreeFont (dpyinfo->display, font_info->font); | 1073 XFreeFont (dpyinfo->display, font_info->font); |
1074 #endif | 1074 #endif |
1075 #ifdef WINDOWSNT | 1075 #ifdef WINDOWSNT |
1076 w32_unload_font (dpyinfo, font_info->font); | 1076 w32_unload_font (dpyinfo, font_info->font); |
1077 #endif | |
1078 #ifdef MAC_OS | |
1079 mac_unload_font (dpyinfo, font_info->font); | |
1077 #endif | 1080 #endif |
1078 UNBLOCK_INPUT; | 1081 UNBLOCK_INPUT; |
1079 | 1082 |
1080 /* Mark font table slot free. */ | 1083 /* Mark font table slot free. */ |
1081 font_info->font = NULL; | 1084 font_info->font = NULL; |