[Emacs-diffs] trunk r118275: Remove `eww-colorize-region'

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 118275
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-03 22:27:24 +0100
message:
  Remove `eww-colorize-region'
  
  (eww-colorize-region): Remove duplicate function.
  (eww-tag-body): Use `shr-colorize-region'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-03 20:33:32 +0000
+++ b/lisp/ChangeLog    2014-11-03 21:27:24 +0000
@@ -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 <address@hidden>
 

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2014-11-03 20:33:32 +0000
+++ b/lisp/net/eww.el   2014-11-03 21:27:24 +0000
@@ -370,20 +370,7 @@
         (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))))