shr-color: only return hexadecimal part of colors

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a74389e..a00b9bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-11-24  Julien Danjou  <julien@danjou.info>
 
+       * shr.el (shr-insert-color-overlay): Remove specific rgb() check.
+
+       * shr-color.el (shr-color->hexadecimal): Only return the hexadecimal
+       matched part.
+
        * color-lab.el: Fix all expt calls to use float type.
 
 2010-11-24  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/shr-color.el b/lisp/shr-color.el
index 1e96567..78fd039 100644 (file)
--- a/lisp/shr-color.el
+++ b/lisp/shr-color.el
@@ -231,10 +231,10 @@ Like rgb() or hsl()."
   (when color
     (cond
      ;; Hexadecimal color: #abc or #aabbcc
-     ((string-match-p
-       "#[0-9a-fA-F]\\{3\\}[0-9a-fA-F]\\{3\\}?"
+     ((string-match
+       "\\(#[0-9a-fA-F]\\{3\\}[0-9a-fA-F]\\{3\\}?\\)"
        color)
-      color)
+      (match-string 1 color))
      ;; rgb() or rgba() colors
      ((or (string-match
            "rgb(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*)"

diff --git a/lisp/shr.el b/lisp/shr.el
index 3d3b199..fc1286e 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -502,9 +502,6 @@ START, and END."
 
 (defun shr-insert-color-overlay (color start end)
   (when color
-    (when (and (not (string-match "\\`rgb([^\)]+)\\'" color))
-              (string-match " " color))
-      (setq color (car (split-string color))))
     (let ((overlay (make-overlay start end)))
       (overlay-put overlay 'face (cons 'foreground-color
                                       (cadr (shr-color-check color)))))))