From 303fd9411f21d19604306ecdbd89941bf4923201 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 3 Nov 2014 22:27:24 +0100 Subject: [PATCH] Remove `eww-colorize-region' (eww-colorize-region): Remove duplicate function. (eww-tag-body): Use `shr-colorize-region'. --- lisp/ChangeLog | 2 ++ lisp/net/eww.el | 15 +-------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 292062a4680..a94725c0b56 100644 --- 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 diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 1ff26bc50a1..705d79cdb77 100644 --- 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)))) -- 2.11.4.GIT