From fca66dcf24100d1333b01882d03528b3519d5f33 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 12 Apr 2005 08:12:30 +0000 Subject: [PATCH] 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 * lisp/nnrss.el (nnrss-node-text): Replace CRLFs (which might be contained in text because xml.el decodes entities) with LFs. --- lisp/ChangeLog | 5 +++++ lisp/nnrss.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de9cb843a..7aa32f771 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-04-12 Katsumi Yamaoka + + * 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 * nnimap.el (nnimap-date-days-ago): Handle byte-compiler warnings diff --git a/lisp/nnrss.el b/lisp/nnrss.el index 2522b71c7..63830408a 100644 --- 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))) -- 2.25.1