# HG changeset patch
# User Andrew Innes <andrewi@gnu.org>
# Date 898536116 0
# Node ID 45ccce07729d7498390caaa1f89917ec88a8d844
# Parent  2649d061d3707b0d1cc35763262196a940303477
(internal-face-interactive): Handle case where BOOL is `color'.

diff -r 2649d061d370 -r 45ccce07729d lisp/term/w32-win.el
--- a/lisp/term/w32-win.el	Mon Jun 22 02:10:41 1998 +0000
+++ b/lisp/term/w32-win.el	Mon Jun 22 17:21:56 1998 +0000
@@ -680,15 +680,23 @@
 		      (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