Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 4fc8f16..081ca11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/nndraft.el (nndraft-request-article): Don't give a special
+       treatment to Mule.
+
        * lisp/nnheader.el (nnheader-auto-save-coding-system): Undo last
        change to restore the default value to emacs-mule or escape-quoted.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e7284f..5be9156 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * nndraft.el (nndraft-request-article): Replace emacs-mule with
+       mm-auto-save-coding-system.
+
        * message.el (message-draft-coding-system): Default to
        iso-2022-7bit.
 

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index e0fe811..ebbc4cd 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -117,13 +117,10 @@
           ;; files may have been saved using that coding-system.
           (maybe-emacs-mule-p (and (not (featurep 'xemacs))
                                    (not (equal "queue" group))
-                                   (static-if (boundp 'MULE)
-                                       (eq message-draft-coding-system
-                                           ;; The present default value.
-                                           '*iso-2022-jp*)
-                                     (eq message-draft-coding-system
-                                         ;; The present default value.
-                                         'iso-2022-7bit)))))
+                                   (eq message-draft-coding-system
+                                       ;; The present default value.
+                                       'iso-2022-7bit)
+                                   (find-coding-system 'emacs-mule))))
       (when (and (file-exists-p newest)
                 (if (equal "queue" group)
                     (nnmail-find-file newest)
@@ -141,11 +138,9 @@
          (when maybe-emacs-mule-p
            (goto-char (point-min))
            (if (re-search-forward "[^\000-\177]" nil t)
-               ;; Consider the file has been saved using `emacs-mule'.
+               ;; Consider the file has been saved as `emacs-mule'.
                (decode-coding-region (point-min) (point-max)
-                                     (static-if (boundp 'MULE)
-                                         '*internal*
-                                       'emacs-mule))
+                                     nnheader-auto-save-coding-system)
              (decode-coding-region (point-min) (point-max)
                                    message-draft-coding-system)))
          (goto-char (point-min))