aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Voelker1996-11-19 07:19:39 +0000
committerGeoff Voelker1996-11-19 07:19:39 +0000
commite5e0a3c9fe3b56e020cebe42edfb6958c91b2fff (patch)
treecaf9897bc390e01b5500ad697203843ab2064bac
parenta4b984a1d6e7cf6371a6567d8cbac18d6907cfff (diff)
downloademacs-e5e0a3c9fe3b56e020cebe42edfb6958c91b2fff.tar.gz
emacs-e5e0a3c9fe3b56e020cebe42edfb6958c91b2fff.zip
(x-defined-colors): Use color names from w32-color-map.
-rw-r--r--lisp/term/w32-win.el8
1 files changed, 5 insertions, 3 deletions
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."
450The argument FRAME specifies which frame to try. 450The argument FRAME specifies which frame to try.
451The value may be different for frames on different X displays." 451The value may be different for frames on different X displays."
452 (or frame (setq frame (selected-frame))) 452 (or frame (setq frame (selected-frame)))
453 (let ((all-colors x-colors) 453 (let* ((color-map-colors (mapcar (lambda (clr) (car clr)) w32-color-map))
454 (this-color nil) 454 (all-colors (or color-map-colors x-colors))
455 (defined-colors nil)) 455 (this-color nil)
456 (defined-colors nil))
457 (message "Defining colors...")
456 (while all-colors 458 (while all-colors
457 (setq this-color (car all-colors) 459 (setq this-color (car all-colors)
458 all-colors (cdr all-colors)) 460 all-colors (cdr all-colors))