Bind message-options when composing MIME messages.

* mml.el (mml-generate-mime): Bind `message-options', which is now
buffer-local, around `mm-with-multibyte-buffer'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0df7629..3009a78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04  Daiki Ueno  <ueno@unixuser.org>
+
+       * mml.el (mml-generate-mime): Bind `message-options', which is now
+       buffer-local, around `mm-with-multibyte-buffer'.
+
 2011-03-03  Tassilo Horn  <tassilo@member.fsf.org>
 
        * nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with

diff --git a/lisp/mml.el b/lisp/mml.el
index 8b196fa..2f4417f 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -461,11 +461,13 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 (defvar mml-boundary nil)
 (defvar mml-base-boundary "-=-=")
 (defvar mml-multipart-number 0)
+(defvar message-options)
 
 (defun mml-generate-mime ()
   "Generate a MIME message based on the current MML document."
   (let ((cont (mml-parse))
-       (mml-multipart-number mml-multipart-number))
+       (mml-multipart-number mml-multipart-number)
+       (message-options (if (boundp 'message-options) message-options)))
     (if (not cont)
        nil
       (mm-with-multibyte-buffer