message.el (message-options): Don't mark it buffer-local when running under XEmacs.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index efeb6b7b239..18a798613a8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,8 @@
 2011-03-04  Daiki Ueno  <ueno@unixuser.org>
 
         * message.el (message-options): Revert the change that's a workaround
-        for XEmacs buffer-local issue.
+        for XEmacs buffer-local issue; don't mark it buffer-local when running
+        under XEmacs.
 
 2011-03-03  Tassilo Horn  <tassilo@member.fsf.org>
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 58daf1baf94..242a6baabee 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1814,7 +1814,12 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 
 (defvar message-options nil
   "Some saved answers when sending message.")
-(make-variable-buffer-local 'message-options)
+;; FIXME: On XEmacs this causes problems since let-binding like:
+;; (let ((message-options message-options)) ...)
+;; as in `message-send' and `mml-preview' loses to buffer-local
+;; variable initialization.
+(unless (featurep 'xemacs)
+  (make-variable-buffer-local 'message-options))
 
 (defvar message-send-mail-real-function nil
   "Internal send mail function.")