Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-95

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 63)

   - Update from CVS

2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/nnrss.el (nnrss-node-text): Replace CRLFs (which might be
   contained in text because xml.el decodes entities) with LFs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de9cb84..7aa32f7 100644 (file)
--- 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 2522b71..6383040 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -680,8 +680,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)))