Mercurial > emacs
changeset 26972:68a3d8530f6c
(face_color_supported_p): Check by tty_defined_color
only when the frame is not window.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 22 Dec 1999 11:40:18 +0000 |
parents | c22771fbb4b3 |
children | c270f9ecfecb |
files | src/xfaces.c |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Wed Dec 22 10:58:10 1999 +0000 +++ b/src/xfaces.c Wed Dec 22 11:40:18 1999 +0000 @@ -1232,15 +1232,15 @@ 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, ¬_used, 0)); + 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, ¬_used, 0)); }