(face_color_supported_p): Check by tty_defined_color

only when the frame is not window.

2 files changed, 14 insertions, 9 deletions

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  <handa@etl.go.jp>
+
+        * xfaces.c (face_color_supported_p): Check by tty_defined_color
+        only when the frame is not window.
+
 1999-12-22  Gerd Moellmann  <gerd@gnu.org>
 
         * 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, &not_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, &not_used, 0));
 }