[Emacs-diffs] /srv/bzr/emacs/trunk r103519: message.el (message-options): Don't mark it buffer-local when running under XEmacs.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103519
author: Daiki Ueno <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 03:56:02 +0000
message:
  message.el (message-options): Don't mark it buffer-local when running under 
XEmacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-03-04 13:59:21 +0000
+++ b/lisp/gnus/ChangeLog       2011-03-05 03:56:02 +0000
@@ -1,7 +1,8 @@
 2011-03-04  Daiki Ueno  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-03-04 13:59:21 +0000
+++ b/lisp/gnus/message.el      2011-03-05 03:56:02 +0000
@@ -1814,7 +1814,12 @@
 
 (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.")