Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cefeaa4..f10253c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-mode): If buffer-file-name, don't set auto
+       save file name.
+       From Geoff Greene <ggreene@wpi.edu>
+
 2002-03-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-util.el (gnus-multiple-choice): Use message. XEmacs only

diff --git a/lisp/message.el b/lisp/message.el
index 124620d..02b2206 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2034,7 +2034,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
     (if (fboundp 'mail-abbrevs-setup)
        (mail-abbrevs-setup)
       (mail-aliases-setup)))
-  (message-set-auto-save-file-name)
+  (unless buffer-file-name
+    (message-set-auto-save-file-name))
   (set (make-local-variable 'indent-tabs-mode) nil)) ;No tabs for indentation.
 
 (defun message-setup-fill-variables ()