From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Dec 2010 15:12:01 +0000 (+0200)
Subject: Fix bug #7589 with EOL format in smtpmail's queued mail.
X-Git-Tag: emacs-pretest-23.2.92~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95e4cc854b04f98815f572218df0f93eebf7e13a;p=emacs.git

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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd5d5576867..30564b9b790 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 62bfbb740c4..7aed6a549ef 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -392,7 +392,14 @@ The list is in preference order.")
 		(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)