From: Joseph Turner <joseph@breatheoutbreathe.in>
Date: Sat, 2 Nov 2024 05:21:34 +0000 (-0700)
Subject: Replace vtable--color-blend with color-blend
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81c878f174d36a359311bf327455c8f2a287224f;p=emacs.git

Replace vtable--color-blend with color-blend

* lisp/emacs-lisp/vtable.el (vtable--face-color): Use `color-blend'.
(vtable--color-blend): Remove unused function.

(cherry picked from commit fdab542a56201b1581abdc0df940e0c50abde1c7)
---

diff --git a/lisp/emacs-lisp/vtable.el b/lisp/emacs-lisp/vtable.el
index 3e389409e29..5b64a98d7bf 100644
--- a/lisp/emacs-lisp/vtable.el
+++ b/lisp/emacs-lisp/vtable.el
@@ -213,18 +213,12 @@ See info node `(vtable)Top' for vtable documentation."
                   (funcall accessor face2)
                 (plist-get face2 slot))))
     (if (and col1 col2)
-        (vtable--color-blend col1 col2)
+        (apply #'color-rgb-to-hex
+               `(,@(color-blend (color-name-to-rgb col1)
+                                (color-name-to-rgb col2))
+                 2))
       (or col1 col2))))
 
-;;; FIXME: This is probably not the right way to blend two colors, is
-;;; it?
-(defun vtable--color-blend (color1 color2)
-  (cl-destructuring-bind (r g b)
-      (mapcar (lambda (n) (* (/ n 2) 255.0))
-              (cl-mapcar #'+ (color-name-to-rgb color1)
-                         (color-name-to-rgb color2)))
-    (format "#%02X%02X%02X" r g b)))
-
 ;;; Interface utility functions.
 
 (defun vtable-current-table ()