# HG changeset patch # User Kenichi Handa # Date 945862818 0 # Node ID 68a3d8530f6cbea60b34edc20194f1b1b2936663 # Parent c22771fbb4b35e964205d3964196d1825ee7ad5f (face_color_supported_p): Check by tty_defined_color only when the frame is not window. diff -r c22771fbb4b3 -r 68a3d8530f6c src/xfaces.c --- 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)); }