shr.el (shr-insert): Tweak line breaking.

shr.el (shr-insert): Handle <pre> better.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4c2f1e11f7cb46909f077b72146e0b7453de4c0d..0fe882c8f213242c131d6d2a46b67e0f3a236dc5 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,6 +1,8 @@
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-ensure-paragraph): Fix the non-empty line case.
+       (shr-insert): Tweak line breaking.
+       (shr-insert): Handle <pre> better.
 
 2010-10-04  Julien Danjou  <julien@danjou.info>
 

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index bfcb91e08c58e1973530dda5fcb29e71d4c38b39..564234bea924e43b25c69e62b56964d96fbf6c8c 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -214,14 +214,14 @@ fit these criteria."
       image)))
 
 (defun shr-tag-pre (cont)
-  (let ((shr-folding-mode nil))
+  (let ((shr-folding-mode 'none))
     (shr-ensure-newline)
     (shr-generic cont)
     (shr-ensure-newline)))
 
 (defun shr-tag-blockquote (cont)
   (let ((shr-indentation (+ shr-indentation 4)))
-    (shr-tag-pre cont)))
+    (shr-generic cont)))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))
@@ -233,7 +233,7 @@ fit these criteria."
     (setq shr-state nil))
   (cond
    ((eq shr-folding-mode 'none)
-    (insert t))
+    (insert text))
    (t
     (let ((first t)
          column)
@@ -244,7 +244,9 @@ fit these criteria."
        (setq column (current-column))
        (when (> column 0)
          (cond
-          ((> (+ column (length elem) 1) shr-width)
+          ((and (or (not first)
+                    (eq shr-state 'space))
+                (> (+ column (length elem) 1) shr-width))
            (insert "\n"))
           ((not first)
            (insert " "))))
@@ -258,9 +260,11 @@ fit these criteria."
        (unless shr-start
          (setq shr-start (point)))
        (insert elem))
+      (setq shr-state nil)
       (when (and (string-match "[ \t\n]\\'" text)
                 (not (bolp)))
-       (insert " "))))))
+       (insert " ")
+       (setq shr-state 'space))))))
 
 (defun shr-get-image-data (url)
   "Get image data for URL.
@@ -293,7 +297,8 @@ Return a string with image data."
   (shr-generic cont))
 
 (defun shr-tag-br (cont)
-  (shr-ensure-newline)
+  (unless (bobp)
+    (insert "\n"))
   (shr-generic cont))
 
 (defun shr-tag-h1 (cont)