[Emacs-diffs] /srv/bzr/emacs/trunk r107538: Make sure smtpmail produces valid mbox files with Unix EOLs for FCC.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107538
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-03-09 13:06:44 +0200
message:
  Make sure smtpmail produces valid mbox files with Unix EOLs for FCC.
  
   lisp/mail/smtpmail.el (smtpmail-send-it): Bind
   coding-system-for-write to *-unix, so that FCC files are kept in
   valid mbox format.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-09 03:21:49 +0000
+++ b/lisp/ChangeLog    2012-03-09 11:06:44 +0000
@@ -1,3 +1,9 @@
+2012-03-09  Eli Zaretskii  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-send-it): Bind
+       coding-system-for-write to *-unix, so that FCC files are kept in
+       valid mbox format.
+
 2012-03-09  Glenn Morris  <address@hidden>
 
        * files.el (dir-locals-find-file):

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2012-02-15 03:15:26 +0000
+++ b/lisp/mail/smtpmail.el     2012-03-09 11:06:44 +0000
@@ -324,7 +324,10 @@
            (if (re-search-forward "^FCC:" delimline t)
                ;; Force `mail-do-fcc' to use the encoding of the mail
                ;; buffer to encode outgoing messages on FCC files.
-               (let ((coding-system-for-write smtpmail-code-conv-from))
+               (let ((coding-system-for-write
+                      ;; mbox files must have Unix EOLs.
+                      (coding-system-change-eol-conversion
+                       smtpmail-code-conv-from 'unix)))
                  (mail-do-fcc delimline)))
            (if mail-interactive
                (with-current-buffer errbuf