From: yamaoka <yamaoka>
Date: Tue, 20 Dec 2005 06:33:52 +0000 (+0000)
Subject: Synch to No Gnus 200512200633.
X-Git-Tag: t-gnus-6_17_4-quimby-~168
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a92cc7e9333a6726f1aad0703d3764a275b65b9;p=elisp%2Fgnus.git-

Synch to No Gnus 200512200633.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe4a219..8331dd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnrss.el (nnrss-request-article): Replace <br />s with newlines
+	in text/plain part.
+	(nnrss-check-group): Don't add excessive newline to dc:subject.
+
 2005-12-19  Mark Plaksin <happy@mcplaksin.org>  (tiny change)
 
 	* nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 8756cd0..f8ce3f8 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -250,7 +250,8 @@ The return value will be `html' or `text'."
 		  (insert "</body></html>\n"))
 	      (mime-edit-insert-text "plain")
 	      (when text
-		(insert text "\n")
+		;; See `nnrss-check-group', which inserts <br />s.
+		(insert (gnus-replace-in-string text "<br />" "\n") "\n")
 		(when (or link enclosure)
 		  (insert "\n")))
 	      (when link
@@ -576,8 +577,8 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 	(setq extra (or extra
 			(nnrss-node-text content-ns 'encoded item)
 			(nnrss-node-text rss-ns 'description item)))
-        (if (setq feed-subject (nnrss-node-text dc-ns 'subject item))
-            (setq extra (concat feed-subject "<br /><br />\n" extra)))
+	(if (setq feed-subject (nnrss-node-text dc-ns 'subject item))
+	    (setq extra (concat feed-subject "<br /><br />" extra)))
 	(setq author (or (nnrss-node-text rss-ns 'author item)
 			 (nnrss-node-text dc-ns 'creator item)
 			 (nnrss-node-text dc-ns 'contributor item)))