From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Nov 2024 15:36:02 +0000 (+0200)
Subject: Revert "Fix color-lighten-hsl logic"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28683d6f2add573e1b43b98b8b9c548816c581ac;p=emacs.git

Revert "Fix color-lighten-hsl logic"

This reverts commit 656c2dd66e77a5fbeb99d358017e8327401fae05.
That commit was mistaken, see bug#74055.

(cherry picked from commit 99650746d916335bbe480c462af83009037632df)
---

diff --git a/lisp/color.el b/lisp/color.el
index 79dced4e3d7..186f1bd9f9a 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -446,7 +446,7 @@ See `color-desaturate-hsl'."
 Given a color defined in terms of hue, saturation, and luminance
 \(arguments H, S, and L), return a color that is PERCENT lighter.
 Returns a list (HUE SATURATION LUMINANCE)."
-  (list H S (color-clamp (+ L (* L (/ percent 100.0))))))
+  (list H S (color-clamp (+ L (/ percent 100.0)))))
 
 (defun color-lighten-name (name percent)
   "Make a color with a specified NAME lighter by PERCENT.
diff --git a/test/lisp/color-tests.el b/test/lisp/color-tests.el
index 0f53e4332a4..bc897edc702 100644
--- a/test/lisp/color-tests.el
+++ b/test/lisp/color-tests.el
@@ -220,32 +220,32 @@
 
 (ert-deftest color-tests-lighten-hsl ()
   (should (equal (color-lighten-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
-  (should (equal (color-lighten-hsl 360 0.5 0.5 -10) '(360 0.5 0.45)))
+  (should (equal (color-lighten-hsl 360 0.5 0.5 -10) '(360 0.5 0.4)))
   (should (equal (color-lighten-hsl 360 0.5 0.5 -500) '(360 0.5 0.0)))
   (should
    (color-tests--approx-equal
-    (color-lighten-hsl 120 0.5 0.8 5) '(120 0.5 0.84)))
+    (color-lighten-hsl 120 0.5 0.8 5) '(120 0.5 0.85)))
   (should
    (equal (color-lighten-hsl 120 0.5 0.8 500) '(120 0.5 1.0))))
 
 (ert-deftest color-tests-lighten-name ()
-  (should (equal (color-lighten-name "black" 100) "#000000000000"))
+  (should (equal (color-lighten-name "black" 100) "#ffffffffffff"))
   (should (equal (color-lighten-name "white" 100) "#ffffffffffff"))
   (should (equal (color-lighten-name "red" 0) "#ffff00000000"))
-  (should (equal (color-lighten-name "red" 10) "#ffff19991999")))
+  (should (equal (color-lighten-name "red" 10) "#ffff33323332")))
 
 (ert-deftest color-tests-darken-hsl ()
   (should (equal (color-darken-hsl 360 0.5 0.5 0) '(360 0.5 0.5)))
-  (should (equal (color-darken-hsl 360 0.5 0.5 -10) '(360 0.5 0.55)))
+  (should (equal (color-darken-hsl 360 0.5 0.5 -10) '(360 0.5 0.6)))
   (should (equal (color-darken-hsl 360 0.5 0.5 -500) '(360 0.5 1.0)))
-  (should (equal (color-darken-hsl 120 0.5 0.8 5) '(120 0.5 0.76)))
+  (should (equal (color-darken-hsl 120 0.5 0.8 5) '(120 0.5 0.75)))
   (should (equal (color-darken-hsl 120 0.5 0.8 500) '(120 0.5 0.0))))
 
 (ert-deftest color-tests-darken-name ()
   (should (equal (color-darken-name "black" 100) "#000000000000"))
   (should (equal (color-darken-name "white" 100) "#000000000000"))
   (should (equal (color-darken-name "red" 0) "#ffff00000000"))
-  (should (equal (color-darken-name "red" 10) "#e66500000000")))
+  (should (equal (color-darken-name "red" 10) "#cccc00000000")))
 
 (ert-deftest color-tests-oklab-to-xyz ()
   (should (color-tests--approx-equal (color-oklab-to-xyz 0 0 0) '(0.0 0.0 0.0)))