# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1292253121 -7200
# Node ID 129f1ae933873ba32d3b6fb59d4f1b86b3e1f29b
# Parent  9dc65348ace1a9e8c27bf1f9c55db855fe33d415
Fix bug #7589 with EOL format in smtpmail's queued mail.

 mail/smtpmail.el (smtpmail-send-it): Write queued mail body with Unix EOLs.

diff -r 9dc65348ace1 -r 129f1ae93387 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 12 22:45:57 2010 +0200
+++ b/lisp/ChangeLog	Mon Dec 13 17:12:01 2010 +0200
@@ -1,3 +1,8 @@
+2010-12-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
+	Unix EOLs.  (Bug#7589)
+
 2010-12-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* subr.el (posn-col-row): Evaluate header-line-format in the
diff -r 9dc65348ace1 -r 129f1ae93387 lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Sun Dec 12 22:45:57 2010 +0200
+++ b/lisp/mail/smtpmail.el	Mon Dec 13 17:12:01 2010 +0200
@@ -392,7 +392,14 @@
 		(make-directory smtpmail-queue-dir t))
 	      (with-current-buffer buffer-data
 		(erase-buffer)
-		(set-buffer-file-coding-system smtpmail-code-conv-from nil t)
+		(set-buffer-file-coding-system
+		 ;; We will be reading the file with no-conversion in
+		 ;; smtpmail-send-queued-mail below, so write it out
+		 ;; with Unix EOLs.
+		 (coding-system-change-eol-conversion
+		  (or smtpmail-code-conv-from 'undecided)
+		  'unix)
+		 nil t)
 		(insert-buffer-substring tembuf)
 		(write-file file-data)
 		(set-buffer buffer-elisp)