[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100308: Fix bug #7589 with EOL format in smtpmail's queued mail.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100308
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-12-13 17:12:01 +0200
message:
  Fix bug #7589 with EOL format in smtpmail's queued mail.
  
   mail/smtpmail.el (smtpmail-send-it): Write queued mail body with Unix EOLs.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-12 20:45:57 +0000
+++ b/lisp/ChangeLog    2010-12-13 15:12:01 +0000
@@ -1,3 +1,8 @@
+2010-12-13  Eli Zaretskii  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
+       Unix EOLs.  (Bug#7589)
+
 2010-12-12  Eli Zaretskii  <address@hidden>
 
        * subr.el (posn-col-row): Evaluate header-line-format in the

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2010-12-09 01:46:03 +0000
+++ b/lisp/mail/smtpmail.el     2010-12-13 15:12:01 +0000
@@ -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)