T-gnus 6.14.6; synch up with Gnus v5.8.8.

[elisp/gnus.git-] / lisp / nndraft.el

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 1d320a5..71531ee 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -26,16 +26,16 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)
 (require 'nnmh)
 (require 'nnoo)
-(require 'mm-util)
 (eval-when-compile
-  (require 'cl)
   ;; This is just to shut up the byte-compiler.
-  (fset 'nndraft-request-group 'ignore))
+  (defalias 'nndraft-request-group 'ignore))
 
 (nnoo-declare nndraft
   nnmh)
@@ -111,12 +111,7 @@
           (newest (if (file-newer-than-file-p file auto) file auto))
           (nntp-server-buffer (or buffer nntp-server-buffer)))
       (when (and (file-exists-p newest)
-                (let ((nnmail-file-coding-system
-                       (if (file-newer-than-file-p file auto)
-                           (if (equal group "drafts")
-                               message-draft-coding-system
-                             mm-text-coding-system)
-                         mm-auto-save-coding-system)))
+                (let ((nnmail-file-coding-system nnheader-text-coding-system))
                   (nnmail-find-file newest)))
        (save-excursion
          (set-buffer nntp-server-buffer)
@@ -134,6 +129,7 @@
   (when (nndraft-request-article article group server (current-buffer))
     (message-remove-header "xref")
     (message-remove-header "lines")
+    (message-remove-header "date")
     t))
 
 (deffoo nndraft-request-update-info (group info &optional server)
@@ -200,10 +196,7 @@
 
 (deffoo nndraft-request-replace-article (article group buffer)
   (nndraft-possibly-change-group group)
-  (let ((nnmail-file-coding-system
-        (if (equal group "drafts")
-            mm-auto-save-coding-system
-          mm-text-coding-system)))
+  (let ((nnmail-file-coding-system nnheader-text-coding-system))
     (nnoo-parent-function 'nndraft 'nnmh-request-replace-article
                          (list article group buffer))))