summaryrefslogtreecommitdiff
path: root/lisp/term/x-win.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/term/x-win.el')
-rw-r--r--lisp/term/x-win.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 2d6dec473f7..b401909fb2b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -490,17 +490,20 @@ This returns ARGS with the arguments that have been processed removed."
"Yellow"
"green yellow"
"GreenYellow")
- "The full list of X colors from the rgb.text file.")
+ "The full list of X colors from the `rgb.text' file.")
-(defun x-defined-colors ()
- "Return a list of colors supported by the current X-Display."
+(defun x-defined-colors (&optional frame)
+ "Return a list of colors supported for a particular frame.
+The argument FRAME specifies which frame to try.
+The value may be different for frames on different X displays."
+ (or frame (setq frame (selected-frame)))
(let ((all-colors x-colors)
(this-color nil)
(defined-colors nil))
(while all-colors
(setq this-color (car all-colors)
all-colors (cdr all-colors))
- (and (x-color-defined-p this-color)
+ (and (face-color-supported-p frame this-color t)
(setq defined-colors (cons this-color defined-colors))))
defined-colors))