From: yamaoka <yamaoka>
Date: Tue, 12 Apr 2005 08:50:25 +0000 (+0000)
Subject: Synch to No Gnus 200504120812.
X-Git-Tag: t-gnus-6_17_4-quimby-~509
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c6f682fd4b7553c1156737b3fed28da6b5e2f6;p=elisp%2Fgnus.git-

Synch to No Gnus 200504120812.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 657b4ae..a138054 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnrss.el (nnrss-node-text): Replace CRLFs (which might be
+	contained in text because xml.el decodes entities) with LFs.
+
 2005-04-11  Lute Kamstra  <lute@gnu.org>
 
 	* nnimap.el (nnimap-date-days-ago): Handle byte-compiler warnings
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index d07a5c3..9e8eff6 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -681,8 +681,11 @@ It is useful when `(setq nnrss-use-local t)'."
 	 (text (if (and node (listp node))
 		   (nnrss-node-just-text node)
 		 node))
-	 (cleaned-text (if text (gnus-replace-in-string
-				 text "^[\000-\037\177]+\\|^ +\\| +$" ""))))
+	 (cleaned-text (if text
+			   (gnus-replace-in-string
+			    (gnus-replace-in-string
+			     text "^[\000-\037\177]+\\|^ +\\| +$" "")
+			    "\r\n" "\n"))))
     (if (string-equal "" cleaned-text)
 	nil
       cleaned-text)))