From d5179a01729ef1befe7c4509d0052e552057abe8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 2 Feb 2000 11:38:16 +0000 Subject: [PATCH] (display-color-p): Use framep-on-display. (display-grayscale-p): New function. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/faces.el | 17 ++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f1ee513f9b..3b371a34d74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2000-02-02 Eli Zaretskii + + * frame.el (frames-on-display-list, framep-on-display): New + functions. + (display-mouse-p, display-popup-menus-p, display-graphic-p) + (display-selections-p, display-screens, display-pixel-width) + (display-pixel-height, display-mm-width, display-mm-height) + (display-backing-store, display-save-under, display-planes) + (display-color-cells, display-visual-class): New functions. + + * term/tty-colors.el (tty-color-gray-shades): New function. + + * faces.el (display-color-p): Use framep-on-display. + (display-grayscale-p): New function. + 2000-01-31 Dave Love * emacs-lisp/fontset.el (standard-fontset-spec): Purecopy it. diff --git a/lisp/faces.el b/lisp/faces.el index 9ac4e020223..2e1c3fc3645 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1201,13 +1201,20 @@ If COLOR is the symbol `unspecified' or one of the strings The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display." - (if (and (stringp display) (not (fboundp 'x-display-list))) - nil - (if (memq (framep (or display (selected-frame))) '(x w32)) - (xw-display-color-p display) - (tty-display-color-p display)))) + (if (memq (framep-on-display display) '(x w32)) + (xw-display-color-p display) + (tty-display-color-p display))) (defalias 'x-display-color-p 'display-color-p) +(defun display-grayscale-p (&optional display) + "Return non-nil if frames on DISPLAY can display shades of gray." + (let ((frame-type (framep-on-display display))) + (cond + ((memq frame-type '(x w32 mac)) + (x-display-grayscale-p display)) + (t + (> (tty-color-gray-shades display) 2))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Background mode. -- 2.39.5