Mercurial > emacs

comparison src/xfaces.c @ 90100:72cf6261961e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72 src/dispextern.h (xassert): Enable unconditionally. * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13 Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 06 Feb 2005 12:06:02 +0000
parents 609c840fe65f 3590dd3050ba
children bf0d492ea2d5
comparison
equal deleted inserted replaced
90099:fa9654493afb 90100:72cf6261961e
1 /* xfaces.c -- "Face" primitives. 1 /* xfaces.c -- "Face" primitives.
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004 2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
736 x_free_gc (f, gc) 736 x_free_gc (f, gc)
737 struct frame *f; 737 struct frame *f;
738 GC gc; 738 GC gc;
739 { 739 {
740 BLOCK_INPUT; 740 BLOCK_INPUT;
741 xassert (--ngcs >= 0); 741 IF_DEBUG (xassert (--ngcs >= 0));
742 XFreeGC (FRAME_X_DISPLAY (f), gc); 742 XFreeGC (FRAME_X_DISPLAY (f), gc);
743 UNBLOCK_INPUT; 743 UNBLOCK_INPUT;
744 } 744 }
745 745
746 #endif /* HAVE_X_WINDOWS */ 746 #endif /* HAVE_X_WINDOWS */
769 x_free_gc (f, gc) 769 x_free_gc (f, gc)
770 struct frame *f; 770 struct frame *f;
771 GC gc; 771 GC gc;
772 { 772 {
773 BLOCK_INPUT; 773 BLOCK_INPUT;
774 xassert (--ngcs >= 0); 774 IF_DEBUG (xassert (--ngcs >= 0));
775 xfree (gc); 775 xfree (gc);
776 UNBLOCK_INPUT; 776 UNBLOCK_INPUT;
777 } 777 }
778 778
779 #endif /* WINDOWSNT */ 779 #endif /* WINDOWSNT */
1509 Lisp_Object frame; 1509 Lisp_Object frame;
1510 XColor not_used; 1510 XColor not_used;
1511 1511
1512 XSETFRAME (frame, f); 1512 XSETFRAME (frame, f);
1513 return 1513 return
1514 #ifdef HAVE_X_WINDOWS 1514 #ifdef HAVE_WINDOW_SYSTEM
1515 FRAME_WINDOW_P (f) 1515 FRAME_WINDOW_P (f)
1516 ? (!NILP (Fxw_display_color_p (frame)) 1516 ? (!NILP (Fxw_display_color_p (frame))
1517 || xstricmp (color_name, "black") == 0 1517 || xstricmp (color_name, "black") == 0
1518 || xstricmp (color_name, "white") == 0 1518 || xstricmp (color_name, "white") == 0
1519 || (background_p 1519 || (background_p