Revert e39a27f6, which does not really fix the problem.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a6190d..35d9620 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,11 +3,6 @@
        * message.el (message-options): Revert 22da67af (workaround for
        XEmacs buffer-local issue).
 
-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 2f4417f..8b196fa 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -461,13 +461,11 @@ 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)
-       (message-options (if (boundp 'message-options) message-options)))
+       (mml-multipart-number mml-multipart-number))
     (if (not cont)
        nil
       (mm-with-multibyte-buffer