From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 16 Apr 1995 04:17:36 +0000 (+0000)
Subject: (x-defined-colors): Take frame as optional arg.
X-Git-Tag: emacs-19.34~4392
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=891eb3fef5cdcf690a71619127c029b8c7c949db;p=emacs.git

(x-defined-colors): Take frame as optional arg.
Check whether colors are really supported on the display in use.
---

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))