comparison src/xfaces.c @ 83250:89ac10c67e45

Merged from miles@gnu.org--gnu-2005 (patch 12-13, 79-90) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-79 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-80 Update from CVS * 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/emacs--cvs-trunk--0--patch-83 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-85 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-86 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-87 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-88 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90 Update from CVS: man/calc.texi: Add macro for LaTeX for info output. * 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 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-290
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 10 Feb 2005 20:43:55 +0000
parents 86457de2420c 3590dd3050ba
children 389421e988c2
comparison
equal deleted inserted replaced
83249:267c2ab562ab 83250:89ac10c67e45
1514 Lisp_Object frame; 1514 Lisp_Object frame;
1515 XColor not_used; 1515 XColor not_used;
1516 1516
1517 XSETFRAME (frame, f); 1517 XSETFRAME (frame, f);
1518 return 1518 return
1519 #ifdef HAVE_X_WINDOWS 1519 #ifdef HAVE_WINDOW_SYSTEM
1520 FRAME_WINDOW_P (f) 1520 FRAME_WINDOW_P (f)
1521 ? (!NILP (Fxw_display_color_p (frame)) 1521 ? (!NILP (Fxw_display_color_p (frame))
1522 || xstricmp (color_name, "black") == 0 1522 || xstricmp (color_name, "black") == 0
1523 || xstricmp (color_name, "white") == 0 1523 || xstricmp (color_name, "white") == 0
1524 || (background_p 1524 || (background_p