Mercurial > emacs
changeset 13609:eb141cf52779
(face-color-supported-p): Return nil if no window system.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 20 Nov 1995 23:15:55 +0000 |
| parents | 0f665b0b653f |
| children | 8e82e46aa77b |
| files | lisp/faces.el |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Mon Nov 20 23:11:39 1995 +0000 +++ b/lisp/faces.el Mon Nov 20 23:15:55 1995 +0000 @@ -1176,15 +1176,16 @@ ;; Assuming COLOR is a valid color name, ;; return t if it can be displayed on FRAME. (defun face-color-supported-p (frame color background-p) - (or (x-display-color-p frame) - ;; A black-and-white display can implement these. - (member color '("black" "white")) - ;; A black-and-white display can fake gray for background. - (and background-p - (face-color-gray-p color frame)) - ;; A grayscale display can implement colors that are gray (more or less). - (and (x-display-grayscale-p frame) - (face-color-gray-p color frame)))) + (and window-system + (or (x-display-color-p frame) + ;; A black-and-white display can implement these. + (member color '("black" "white")) + ;; A black-and-white display can fake gray for background. + (and background-p + (face-color-gray-p color frame)) + ;; A grayscale display can implement colors that are gray (more or less). + (and (x-display-grayscale-p frame) + (face-color-gray-p color frame))))) ;; Use FUNCTION to store a color in FACE on FRAME. ;; COLORS is either a single color or a list of colors.