Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / nnrss.el

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index c76f4ff..61c1e9b 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -81,7 +81,7 @@
      "http://www.cnn.com/cnn.rss"
      "The world's news leader.")
     ("FreshMeat"
-     "http://freshmeat.net/backend/fm.rdf"
+     "http://freshmeat.net/backend/fm-releases.rdf"
      "The one-stop-shop for all your Linux software needs.")
     ("The.Guardian.newspaper"
      "http://www.guardianunlimited.co.uk/rss/1,,,00.xml"
@@ -204,8 +204,8 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                    (format "<%d@%s.nnrss>" (car e) group)
                    "\t" ;; id
                    "\t" ;; refs
-                   "0" "\t" ;; chars
-                   "0" "\t" ;; lines
+                   "-1" "\t" ;; chars
+                   "-1" "\t" ;; lines
                    "" "\t" ;; Xref
                    (if (and (nth 6 e)
                             (memq nnrss-description-field
@@ -262,7 +262,12 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
          (insert "\n")
          (if (nth 6 e)
              (let ((point (point)))
-               (insert (nnrss-string-as-multibyte (nth 6 e)) "\n\n")
+               (insert (nnrss-string-as-multibyte (nth 6 e)))
+               (goto-char point)
+               (while (search-forward "\n" nil t)
+                 (delete-char -1))
+               (goto-char (point-max))
+               (insert "\n\n")
                (fill-region point (point))))
          (if (nth 2 e)
              (insert (nth 2 e) "\n")))))