procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(face_color_supported_p): Fix compilation without X11.

Browse source
This commit is contained in:
Stefan Monnier 2004-04-09 16:15:08 +00:00
parent 7b30b20c7e
commit 066a4c6b91
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/xfaces.c
View file

@ -1,5 +1,5 @@
/* xfaces.c -- "Face" primitives.
Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003
Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation.
This file is part of GNU Emacs.
@ -1505,15 +1505,19 @@ face_color_supported_p (f, color_name, background_p)
XColor not_used;
XSETFRAME (frame, f);
return (FRAME_WINDOW_P (f)
? (!NILP (Fxw_display_color_p (frame))
|| xstricmp (color_name, "black") == 0
|| xstricmp (color_name, "white") == 0
|| (background_p
&& face_color_gray_p (f, color_name))
|| (!NILP (Fx_display_grayscale_p (frame))
&& face_color_gray_p (f, color_name)))
: tty_defined_color (f, color_name, &not_used, 0));
return
#ifdef HAVE_X_WINDOWS
FRAME_WINDOW_P (f)
? (!NILP (Fxw_display_color_p (frame))
|| xstricmp (color_name, "black") == 0
|| xstricmp (color_name, "white") == 0
|| (background_p
&& face_color_gray_p (f, color_name))
|| (!NILP (Fx_display_grayscale_p (frame))
&& face_color_gray_p (f, color_name)))
:
#endif
tty_defined_color (f, color_name, &not_used, 0);
}