Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index f9378db..4fc8f16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/nnheader.el (nnheader-auto-save-coding-system): Undo last
+       change to restore the default value to emacs-mule or escape-quoted.
+
 2002-11-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (gnus-article-mime-edit-article-setup): Don't

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9915c1..5e7284f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-draft-coding-system): Default to
+       iso-2022-7bit.
+
+       * mm-util.el (mm-auto-save-coding-system): Undo last change to
+       restore the default value to emacs-mule or escape-quoted.
+
 2002-11-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-encrypt-body): Inhibit encrypting of

diff --git a/lisp/message.el b/lisp/message.el
index 6218a32..6109243 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1392,9 +1392,12 @@ The cdr of ech entry is a function for applying the face to a region.")
                 (const :tag "always" t)
                 (const :tag "ask" ask)))
 
-(defvar message-draft-coding-system
-  nnheader-auto-save-coding-system
-  "Coding system to compose mail.")
+(defvar message-draft-coding-system (if (boundp 'MULE)
+                                       '*iso-2022-jp*
+                                     'iso-2022-7bit)
+  "Coding system to compose mail.
+Note that the default value for this variable was emacs-mule for Emacs
+or escape-quoted for XEmacs-MULE in the past.")
 
 (defcustom message-send-mail-partially-limit 1000000
   "The limitation of messages sent as message/partial.

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 296da39..adf14b5 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -154,12 +154,15 @@
   "Text coding system for write.")
 
 (defvar mm-auto-save-coding-system
-  (if (mm-coding-system-p 'iso-2022-7bit)
-      'iso-2022-7bit
-    mm-binary-coding-system)
-  "Coding system of auto save file.
-Note that the default value for this variable was emacs-mule for Emacs
-or escape-quoted for XEmacs-MULE in the past.")
+  (cond
+   ((mm-coding-system-p 'emacs-mule)
+    (if (memq system-type '(windows-nt ms-dos ms-windows))
+       (if (mm-coding-system-p 'emacs-mule-dos)
+           'emacs-mule-dos mm-binary-coding-system)
+      'emacs-mule))
+   ((mm-coding-system-p 'escape-quoted) 'escape-quoted)
+   (t mm-binary-coding-system))
+  "Coding system of auto save file.")
 
 (defvar mm-universal-coding-system mm-auto-save-coding-system
   "The universal coding system.")

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index f9c452b..f36059b 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -108,12 +108,17 @@ This variable is a substitute for `mm-text-coding-system'.")
   "Text coding system for write.
 This variable is a substitute for `mm-text-coding-system-for-write'.")
 
-(defvar nnheader-auto-save-coding-system (static-if (boundp 'MULE)
-                                            '*iso-2022-jp*
-                                          'iso-2022-7bit)
-  "Coding system of auto save file.
-Note that the default value for this variable was emacs-mule for Emacs
-or escape-quoted for XEmacs-MULE in the past.")
+(defvar nnheader-auto-save-coding-system
+  (cond
+   ((boundp 'MULE) '*junet*)
+   ((not (fboundp 'find-coding-system)) nil)
+   ((find-coding-system 'emacs-mule)
+    (if (memq system-type '(windows-nt ms-dos ms-windows))
+       'emacs-mule-dos 'emacs-mule))
+   ((find-coding-system 'escape-quoted) 'escape-quoted)
+   ((find-coding-system 'no-conversion) 'no-conversion)
+   (t nil))
+  "Coding system of auto save file.")
 
 (eval-and-compile
   (autoload 'nnmail-message-id "nnmail")