Mercurial > emacs
comparison src/xfaces.c @ 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 | 9d6d94db8909 |
children | 561457ff9b17 |
comparison
equal
deleted
inserted
replaced
26971:c22771fbb4b3 | 26972:68a3d8530f6c |
---|---|
1230 { | 1230 { |
1231 Lisp_Object frame; | 1231 Lisp_Object frame; |
1232 XColor not_used; | 1232 XColor not_used; |
1233 | 1233 |
1234 XSETFRAME (frame, f); | 1234 XSETFRAME (frame, f); |
1235 return ((FRAME_WINDOW_P (f) | 1235 return (FRAME_WINDOW_P (f) |
1236 && (!NILP (Fxw_display_color_p (frame)) | 1236 ? (!NILP (Fxw_display_color_p (frame)) |
1237 || xstricmp (color_name, "black") == 0 | 1237 || xstricmp (color_name, "black") == 0 |
1238 || xstricmp (color_name, "white") == 0 | 1238 || xstricmp (color_name, "white") == 0 |
1239 || (background_p | 1239 || (background_p |
1240 && face_color_gray_p (f, color_name)) | 1240 && face_color_gray_p (f, color_name)) |
1241 || (!NILP (Fx_display_grayscale_p (frame)) | 1241 || (!NILP (Fx_display_grayscale_p (frame)) |
1242 && face_color_gray_p (f, color_name)))) | 1242 && face_color_gray_p (f, color_name))) |
1243 || tty_defined_color (f, color_name, ¬_used, 0)); | 1243 : tty_defined_color (f, color_name, ¬_used, 0)); |
1244 } | 1244 } |
1245 | 1245 |
1246 | 1246 |
1247 DEFUN ("face-color-gray-p", Fface_color_gray_p, Sface_color_gray_p, 1, 2, 0, | 1247 DEFUN ("face-color-gray-p", Fface_color_gray_p, Sface_color_gray_p, 1, 2, 0, |
1248 "Return non-nil if COLOR is a shade of gray (or white or black).\n\ | 1248 "Return non-nil if COLOR is a shade of gray (or white or black).\n\ |