From: Geoff Voelker <voelker@cs.washington.edu>
Date: Tue, 19 Nov 1996 07:19:39 +0000 (+0000)
Subject: (x-defined-colors): Use color names from w32-color-map.
X-Git-Tag: emacs-20.1~3348
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5e0a3c9fe3b56e020cebe42edfb6958c91b2fff;p=emacs.git

(x-defined-colors): Use color names from w32-color-map.
---

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index a637aa54875..c295cc39617 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -450,9 +450,11 @@ This returns ARGS with the arguments that have been processed removed."
 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))
+  (let* ((color-map-colors (mapcar (lambda (clr) (car clr)) w32-color-map))
+	 (all-colors (or color-map-colors x-colors))
+	 (this-color nil)
+	 (defined-colors nil))
+    (message "Defining colors...")
     (while all-colors
       (setq this-color (car all-colors)
 	    all-colors (cdr all-colors))