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

[gnus] / lisp / message.el

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.")