From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 29 Feb 2016 02:31:45 +0000 (+1100)
Subject: * lisp/faces.el: Remove duplicated functions from previous patch.
X-Git-Tag: emacs-26.0.90~2437
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f195dd692bfc1911e85f92145df57a2dba460f58;p=emacs.git

* lisp/faces.el: Remove duplicated functions from previous patch.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index b5e9fdca08e..c9cc611a97a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1792,32 +1792,6 @@ If FRAME is nil, that stands for the selected frame."
     (mapcar 'car (tty-color-alist frame))))
 (defalias 'x-defined-colors 'defined-colors)
 
-(defun defined-colors-with-face-attributes (&optional frame)
-  "Return a list of colors supported for a particular frame.
-See `defined-colors' for arguments and return value. In contrast
-to `define-colors' the elements of the returned list are color
-strings with text properties, that make the color names render
-with the color they represent as background color."
-  (mapcar
-   (lambda (color-name)
-     (let ((foreground (readable-foreground-color color-name))
-	   (color      (copy-sequence color-name)))
-       (propertize color 'face (list :foreground foreground
-				     :background color))))
-   (defined-colors frame)))
-
-(defun readable-foreground-color (color)
-  "Return a readable foreground color for background COLOR."
-  (let* ((rgb   (color-values color))
-	 (max   (apply #'max rgb))
-	 (black (car (color-values "black")))
-	 (white (car (color-values "white"))))
-    ;; Select black or white depending on which one is less similar to
-    ;; the brightest component.
-    (if (> (abs (- max black)) (abs (- max white)))
-	"black"
-      "white")))
-
 (defun defined-colors-with-face-attributes (&optional frame)
   "Return a list of colors supported for a particular frame.
 See `defined-colors' for arguments and return value. In contrast