(nnrss-request-article): Fix last change; fill text/plain parts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89fe85e..86bb1a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnrss.el (nnrss-request-article): Fix last change; fill
+       text/plain parts.
+
 2005-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnrss.el (nnrss-request-article): Replace <br />s with newlines

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 16f523e..f1ca668 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -212,8 +212,25 @@ for decoding when the cdr that the data specify is not available.")
                    "<#part type=\"text/plain\">\n")
            (setq body (point))
            (when text
-             ;; See `nnrss-check-group', which inserts <br />s.
-             (insert (gnus-replace-in-string text "<br />" "\n") "\n")
+             (insert text)
+             (goto-char body)
+             ;; See `nnrss-check-group', which inserts "<br /><br />".
+             (if (search-forward "<br /><br />" nil t)
+                 (if (eobp)
+                     (replace-match "\n")
+                   (replace-match "\n\n")
+                   (let ((fill-column default-fill-column)
+                         (window (get-buffer-window nntp-server-buffer)))
+                     (when window
+                       (setq fill-column
+                             (max 1 (/ (* (window-width window) 7) 8))))
+                     (fill-region (point) (point-max))
+                     (goto-char (point-max))
+                     ;; XEmacs version of `fill-column' inserts newline.
+                     (unless (bolp)
+                       (insert "\n"))))
+               (goto-char (point-max))
+               (insert "\n"))
              (when (or link enclosure)
                (insert "\n")))
            (when link