From: Kenichi Handa Date: Wed, 22 Dec 1999 11:41:16 +0000 (+0000) Subject: (face_color_supported_p): Check by tty_defined_color X-Git-Tag: emacs-pretest-21.0.90~5647 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8affcced095d1ea506b26aa4558f7356a5f01112;p=emacs.git (face_color_supported_p): Check by tty_defined_color only when the frame is not window. --- diff --git a/src/ChangeLog b/src/ChangeLog index 258ff68644b..3b46fdb1488 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +1999-12-22 Kenichi Handa + + * xfaces.c (face_color_supported_p): Check by tty_defined_color + only when the frame is not window. + 1999-12-22 Gerd Moellmann * buffer.c (Fset_buffer_multibyte): Arrange for a thorough diff --git a/src/xfaces.c b/src/xfaces.c index 2017edbfd9a..5bccdc4baac 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1232,15 +1232,15 @@ 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, ¬_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)); }