diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-08 21:23:09 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-08 21:23:09 -0700 |
| commit | 32ade3f01a0185f2a836c313d9d50564abe4e254 (patch) | |
| tree | 195ed03adf2f7757d67caf79dd2baff44911748c /lisp/faces.el | |
| parent | fdcb06012a36a8ec800e33554ae94c26e43a7c05 (diff) | |
| parent | 942a57a2a5c56575a15dd22e1feebd1825f281b0 (diff) | |
| download | emacs-32ade3f01a0185f2a836c313d9d50564abe4e254.tar.gz | |
Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka@jpl.org
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index aedd5db72f1..d7b330ee64c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1825,7 +1825,9 @@ If omitted or nil, that stands for the selected frame's display." (declare-function x-display-grayscale-p "xfns.c" (&optional terminal)) (defun display-grayscale-p (&optional display) - "Return non-nil if frames on DISPLAY can display shades of gray." + "Return non-nil if frames on DISPLAY can display shades of gray. +DISPLAY should be either a frame or a display name (a string). +If omitted or nil, that stands for the selected frame's display." (let ((frame-type (framep-on-display display))) (cond ((memq frame-type '(x w32 ns)) |