Make message-options buffer-local only under GNU Emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35d9620..c9afde5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2011-03-04  Daiki Ueno  <ueno@unixuser.org>
 
-       * message.el (message-options): Revert 22da67af (workaround for
-       XEmacs buffer-local issue).
+       * message.el (message-options): Revert 22da67af (workaround 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/message.el b/lisp/message.el
index c8a706e..a6e007a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1858,7 +1858,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.")