diff lisp/mail/smtpmail.el @ 112046:129f1ae93387

Fix bug #7589 with EOL format in smtpmail's queued mail. mail/smtpmail.el (smtpmail-send-it): Write queued mail body with Unix EOLs.

--- 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)