Remove `eww-colorize-region'

(eww-colorize-region): Remove duplicate function.
(eww-tag-body): Use `shr-colorize-region'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 292062a46806d38177021c5970e73681d0d0f463..a94725c0b5651fca26d81f8eaa341100af763d9f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
        (eww-display-pdf): New function.
        (eww-render): Display PDFs with `doc-view'.
        (url-queue): Require `url-queue' to avoid compilation warning.
+       (eww-colorize-region): Remove duplicate function.
+       (eww-tag-body): Use `shr-colorize-region'.
 
 2014-11-03  Yoni Rabkin <yrk@gnu.org>
 

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 1ff26bc50a14dc83a910ead4f914b49abb36c4ee..705d79cdb77e2f208f6dd37a3018a07fb9e3c975 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -370,20 +370,7 @@ word(s) will be searched for via `eww-search-prefix'."
         (shr-stylesheet (list (cons 'color fgcolor)
                               (cons 'background-color bgcolor))))
     (shr-generic cont)
-    (eww-colorize-region start (point) fgcolor bgcolor)))
-
-(defun eww-colorize-region (start end fg &optional bg)
-  (when (or fg bg)
-    (let ((new-colors (shr-color-check fg bg)))
-      (when new-colors
-       (when fg
-         (add-face-text-property start end
-                                 (list :foreground (cadr new-colors))
-                                 t))
-       (when bg
-         (add-face-text-property start end
-                                 (list :background (car new-colors))
-                                 t))))))
+    (shr-colorize-region start (point) fgcolor bgcolor)))
 
 (defun eww-display-raw ()
   (let ((data (buffer-substring (point) (point-max))))