(rmail-output): Bind buffer-file-coding-system even when rmail-enable-mime is nil.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 71e77869438f3ea650a89918477596b9c44f74ae..ecfab009f8f5515df4eccb159286a74ca06c61d9 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,7 +1,7 @@
 2007-04-27  Henrik Enberg  <enberg@printf.se>
 
-       * rmailout.el (rmail-output): Don't bind
-       buffer-file-coding-system.
+       * rmailout.el (rmail-output): Bind buffer-file-coding-system even
+       when rmail-enable-mime is nil.
 
        * rmail.el (rmail-perm-variables): Make sure rmail-desc-vector is
        buffer local.

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 26724ee77a56aac3f6d3bf76f1516fdd4e3fd87d..7224ce91f682bf1f9663362cc02f95c0f6e15f82 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -169,6 +169,10 @@ The optional fourth argument FROM-GNUS is set when called from GNUS."
        (while (> count 0)
          (with-temp-buffer
            (insert-buffer-substring rmailbuf)
+           ;; ensure we can write without barfing on exotic characters
+           (setq buffer-file-coding-system
+                 (or rmail-file-coding-system 'raw-text))
+           ;; prune junk headers
            (rmail-delete-unwanted-fields)
            (if (not destbuf)
                ;; The destination file is not being visited, just write