# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1113368285 0
# Node ID 6cf26dc690b28dee2a5530332441d0f334b22cd8
# Parent  3e0057a2ce89a83200b5e158865c285ab5f0304e
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.

diff -r 3e0057a2ce89 -r 6cf26dc690b2 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Apr 13 02:25:43 2005 +0000
+++ b/lisp/gnus/ChangeLog	Wed Apr 13 04:58:05 2005 +0000
@@ -1,3 +1,12 @@
+2005-04-13  Miles Bader  <miles@gnu.org>
+
+	* mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.
+
+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>
 
 	* message.el (message-make-date): Handle byte-compiler warnings
diff -r 3e0057a2ce89 -r 6cf26dc690b2 lisp/gnus/mm-util.el
--- a/lisp/gnus/mm-util.el	Wed Apr 13 02:25:43 2005 +0000
+++ b/lisp/gnus/mm-util.el	Wed Apr 13 04:58:05 2005 +0000
@@ -91,7 +91,12 @@
      ;; (string-to-multibyte s)   ~= (decode-coding-string s 'binary)
      ;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system)
      (string-as-multibyte . identity)
-     (string-to-multibyte . mm-string-as-multibyte)
+     (string-to-multibyte
+      . (lambda (string)
+	  "Return a multibyte string with the same individual chars as string."
+	  (mapconcat
+	   (lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
+	   string "")))
      (multibyte-string-p . ignore)
      ;; It is not a MIME function, but some MIME functions use it.
      (make-temp-file . (lambda (prefix &optional dir-flag)
diff -r 3e0057a2ce89 -r 6cf26dc690b2 lisp/gnus/nnrss.el
--- 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)))