shr-color: really return background if fixed

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c0692e..0433579 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-24  Julien Danjou  <julien@danjou.info>
+
+       * shr-color.el (shr-color-visible): Really return original background
+       if fixed.
+
 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-color-check): Protect against non-existant colour names.

diff --git a/lisp/shr-color.el b/lisp/shr-color.el
index 78fd039..0baacd7 100644 (file)
--- a/lisp/shr-color.el
+++ b/lisp/shr-color.el
@@ -337,11 +337,14 @@ color will be adapted to be visible on BG."
       (let ((Ls (set-minimum-interval (car bg-lab) (car fg-lab) 0 100
                                       shr-color-visible-luminance-min
                                       fixed-background)))
-        (setcar bg-lab (car Ls))
+        (unless fixed-background
+          (setcar bg-lab (car Ls)))
         (setcar fg-lab (cadr Ls))
         (list
-         (apply 'format "#%02x%02x%02x"
-                (mapcar (lambda (x) (* (max (min 1 x) 0) 255)) (apply 'lab->rgb bg-lab)))
+         (if fixed-background
+             bg
+           (apply 'format "#%02x%02x%02x"
+                  (mapcar (lambda (x) (* (max (min 1 x) 0) 255)) (apply 'lab->rgb bg-lab))))
          (apply 'format "#%02x%02x%02x"
                 (mapcar (lambda (x) (* (max (min 1 x) 0) 255)) (apply 'lab->rgb fg-lab))))))))