(shr-tag-p): Don't insert newlines at the start of the buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa4c82d..4b4ba56 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * shr.el (shr-tag-p): Don't insert newlines at the start of the
+       buffer.
+
+       * mm-decode.el (mm-shr): Narrow before inserting, so that shr can know
+       when it's at the start of the buffer.
+
        * shr.el (shr-tag-blockquote): Convert name.
        (shr-rescale-image): Use the right image-size variant.
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index e98d666..72bf61b 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1679,9 +1679,11 @@ If RECURSIVE, search recursively."
   (let ((article-buffer (current-buffer)))
     (unless handle
       (setq handle (mm-dissect-buffer t)))
-    (shr-insert-document
-     (mm-with-part handle
-       (libxml-parse-html-region (point-min) (point-max))))))
+    (save-restriction
+      (narrow-to-region (point) (point))
+      (shr-insert-document
+       (mm-with-part handle
+        (libxml-parse-html-region (point-min) (point-max)))))))
 
 (provide 'mm-decode)
 

diff --git a/lisp/shr.el b/lisp/shr.el
index 2efd740..af2a5ef 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -89,8 +89,9 @@ fit these criteria."
       (shr-descend sub)))))
 
 (defun shr-tag-p (cont)
-  (shr-ensure-newline)
-  (insert "\n")
+  (unless (bobp)
+    (shr-ensure-newline)
+    (insert "\n"))
   (shr-generic cont)
   (insert "\n"))