From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 22 Mar 2021 18:47:25 +0000 (+0100)
Subject: Use read-color in read-face-attribute for color attributes
X-Git-Tag: emacs-28.0.90~3179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=add90dcc8a1b61edeb62b53cec5b532b4bb5d311;p=emacs.git

Use read-color in read-face-attribute for color attributes

* lisp/faces.el (read-face-attribute): Use read-color when
prompting for a color (bug#47316).
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 5ae3906acc2..3ea4c940a32 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1259,7 +1259,15 @@ of a global face.  Value is the new attribute value."
 		   (or (car (rassoc old-value valid))
 		       (format "%s" old-value))))
 	     (setq new-value
-		   (face-read-string face default attribute-name valid))
+                   (if (memq attribute '(:foreground :background))
+                       (let ((color
+                              (read-color
+                               (format-prompt "%s for face `%s'"
+                                              default attribute-name face))))
+                         (if (equal (string-trim color) "")
+                             default
+                           color))
+		     (face-read-string face default attribute-name valid)))
 	     (if (equal new-value default)
 		 ;; Nothing changed, so don't bother with all the stuff
 		 ;; below.  In particular, this avoids a non-tty color