summaryrefslogtreecommitdiff
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-10-12 21:06:27 +0000
committerMiles Bader <miles@gnu.org>2007-10-12 21:06:27 +0000
commit985773c9038f9847f9e7362f3b5fb0c8acac13a2 (patch)
tree12d10cb76729ccbdc5ace4688d15f83894a70cc9 /src/xfaces.c
parent47632e43ca42e26da139289f1e0f4f69e8c140fd (diff)
downloademacs-985773c9038f9847f9e7362f3b5fb0c8acac13a2.tar.gz
Fix up multi-tty merge
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-261 Creator: Stefan Monnier <monnier@iro.umontreal.ca>
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 298e9e52d55..d3e7a105b60 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5572,11 +5572,11 @@ free_realized_face (f, face)
free_face_fontset (f, face);
if (face->gc)
{
+ BLOCK_INPUT;
#ifdef USE_FONT_BACKEND
if (enable_font_backend && face->font_info)
font_done_for_face (f, face);
#endif /* USE_FONT_BACKEND */
- BLOCK_INPUT;
x_free_gc (f, face->gc);
face->gc = 0;
UNBLOCK_INPUT;
@@ -5747,11 +5747,11 @@ clear_face_gcs (c)
struct face *face = c->faces_by_id[i];
if (face && face->gc)
{
+ BLOCK_INPUT;
#ifdef USE_FONT_BACKEND
if (enable_font_backend && face->font_info)
font_done_for_face (c->f, face);
#endif /* USE_FONT_BACKEND */
- BLOCK_INPUT;
x_free_gc (c->f, face->gc);
face->gc = 0;
UNBLOCK_INPUT;