Mercurial > emacs
diff lisp/gnus/nnrss.el @ 61519:6cf26dc690b2
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 62-64)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- (mm-string-to-multibyte): Use Gnus trunk definition.
2005-04-13 Miles Bader <miles@gnu.org>
* lisp/gnus/mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.
2005-04-12 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-node-text): Replace CRLFs (which might be
contained in text because xml.el decodes entities) with LFs.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 13 Apr 2005 04:58:05 +0000 |
| parents | ad05d91d3598 |
| children | d1245d218964 |
line wrap: on
line diff
--- a/lisp/gnus/nnrss.el Wed Apr 13 02:25:43 2005 +0000 +++ b/lisp/gnus/nnrss.el Wed Apr 13 04:58:05 2005 +0000 @@ -679,8 +679,11 @@ (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)))