(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 258ff68644baec6f0b5a8555bd0ecbce2c127a35..3b46fdb1488944820d5342087288d3147227e5ad 100644 (file)
--- 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 2017edbfd9aa71db1172b5cf9e0dc994ddafa0a0..5bccdc4baac88b382703fcee8b2d5bbccc5833dd 100644 (file)
--- 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));
 }