(shr-add-font): Don't put the font properties on the newline or the indentation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e42331..3fba14c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

+       * shr.el (shr-add-font): Don't put the font properties on the newline
+       or the indentation.
+

        * message.el (message-fix-before-sending): Change options when sending
        non-printable characters.
 
        * message.el (message-fix-before-sending): Change options when sending
        non-printable characters.
 

diff --git a/lisp/shr.el b/lisp/shr.el
index acf47aa..9645f04 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -318,9 +318,20 @@ redirects somewhere else."
     (dolist (type types)
       (shr-add-font (or shr-start (point)) (point) type))))
 
     (dolist (type types)
       (shr-add-font (or shr-start (point)) (point) type))))
 

+;; Add an overlay in the region, but avoid putting the font properties
+;; on blank text at the start of the line, and the newline at the end,
+;; to avoid ugliness.

 (defun shr-add-font (start end type)
 (defun shr-add-font (start end type)

-  (let ((overlay (make-overlay start end)))
-    (overlay-put overlay 'face type)))
+  (save-excursion
+    (goto-char start)
+    (while (< (point) end)
+      (when (bolp)
+       (skip-chars-forward " "))
+      (let ((overlay (make-overlay (point) (min (line-end-position) end))))
+       (overlay-put overlay 'face type))
+      (if (< (line-end-position) end)
+         (forward-line 1)
+       (goto-char end)))))

 
 (defun shr-browse-url ()
   "Browse the URL under point."
 
 (defun shr-browse-url ()
   "Browse the URL under point."