# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1233396517 0
# Node ID 4bb10611bac4293b4f201ae890b220cc8aaea6be
# Parent  d77415a2f332775bd686692ad57089c9130aa386
(rmail-redecode-body): Don't change EOL conversion of the new encoding if
the old one left it unspecified.

diff -r d77415a2f332 -r 4bb10611bac4 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Sat Jan 31 09:32:45 2009 +0000
+++ b/lisp/mail/rmail.el	Sat Jan 31 10:08:37 2009 +0000
@@ -2687,9 +2687,10 @@
 	    ;; Make sure the new coding system uses the same EOL
 	    ;; conversion, to prevent ^M characters from popping up
 	    ;; all over the place.
-	    (setq coding
-		  (coding-system-change-eol-conversion
-		   coding (coding-system-eol-type old-coding)))
+	    (let ((eol-type (coding-system-eol-type old-coding)))
+	      (if (numberp eol-type)
+		  (setq coding
+			(coding-system-change-eol-conversion coding eol-type))))
 	    ;; If old-coding is `undecided', encode-coding-region
 	    ;; will not encode the text at all.  Find a proper
 	    ;; non-trivial encoding to use.