From: Andrew Innes <andrewi@gnu.org>
Date: Mon, 22 Jun 1998 17:21:56 +0000 (+0000)
Subject: (internal-face-interactive): Handle case where BOOL is `color'.
X-Git-Tag: emacs-20.3~540
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ce36200dd3b2404ec0a0f0ef31adeb4eeb84536;p=emacs.git

(internal-face-interactive): Handle case where BOOL is `color'.
---

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 5ddb14e5384..e7df55c6b96 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -680,15 +680,23 @@ This is in addition to the primary selection.")
 		      (or (funcall fn face (selected-frame))
 			  (funcall fn 'default (selected-frame)))))
 	 (fn-win (intern (concat (symbol-name window-system) "-select-" what)))
-	 (value 
-	  (if (fboundp fn-win)
-	      (funcall fn-win)
-	    (if bool
-		(y-or-n-p (concat "Should face " (symbol-name face)
-				  " be " bool "? "))
-	      (read-string (concat prompt " " (symbol-name face) " to: ")
-			   default)))))
-	 (list face (if (equal value "") nil value))))
+	 value)
+    (setq value
+	  (cond ((fboundp fn-win)
+		 (funcall fn-win))
+		((eq bool 'color)
+		 (completing-read (concat prompt " " (symbol-name face) " to: ")
+				  (mapcar (function (lambda (color)
+						      (cons color color)))
+					  x-colors)
+				  nil nil nil nil default))
+		(bool
+		 (y-or-n-p (concat "Should face " (symbol-name face)
+				   " be " bool "? ")))
+		(t
+		 (read-string (concat prompt " " (symbol-name face) " to: ")
+			      nil nil default))))
+    (list face (if (equal value "") nil value))))
 
 ;; Redefine the font selection to use the standard W32 dialog