Mercurial > emacs
diff src/xfaces.c @ 83248:86457de2420c
Merged from miles@gnu.org--gnu-2005 (patch 76-78)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 04 Feb 2005 15:36:07 +0000 |
parents | a464201fbd10 d6551c039c8f |
children | 89ac10c67e45 |
line wrap: on
line diff
--- a/src/xfaces.c Fri Feb 04 14:06:45 2005 +0000 +++ b/src/xfaces.c Fri Feb 04 15:36:07 2005 +0000 @@ -1,5 +1,5 @@ /* xfaces.c -- "Face" primitives. - Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation. This file is part of GNU Emacs. @@ -741,9 +741,7 @@ GC gc; { BLOCK_INPUT; -#if GLYPH_DEBUG - xassert (--ngcs >= 0); -#endif + IF_DEBUG (xassert (--ngcs >= 0)); XFreeGC (FRAME_X_DISPLAY (f), gc); UNBLOCK_INPUT; } @@ -776,7 +774,7 @@ GC gc; { BLOCK_INPUT; - xassert (--ngcs >= 0); + IF_DEBUG (xassert (--ngcs >= 0)); xfree (gc); UNBLOCK_INPUT; }