X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnndraft.el;h=57397fbce5cb3e835b71ed7e7927d21d7f020596;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=1214406714549993e6e0e2c406e5fc9020b39690;hpb=12880262125c73b531b08cd9005fbaf49c2c3395;p=elisp%2Fgnus.git-

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 1214406..57397fb 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -1,5 +1,6 @@
 ;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -26,14 +27,13 @@
 
 ;;; 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))
 
 (nnoo-declare nndraft
   nnmh)
@@ -113,8 +113,8 @@
 			(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)))
+			      nnheader-text-coding-system)
+			  nnheader-auto-save-coding-system)))
 		   (nnmail-find-file newest)))
 	(save-excursion
 	  (set-buffer nntp-server-buffer)
@@ -132,7 +132,9 @@
   (when (nndraft-request-article article group server (current-buffer))
     (message-remove-header "xref")
     (message-remove-header "lines")
-    (message-remove-header "date")
+    ;; Articles in nndraft:queue are considered as sent messages.  The
+    ;; Date field should be the time when they are sent.
+    ;;(message-remove-header "date")
     t))
 
 (deffoo nndraft-request-update-info (group info &optional server)
@@ -180,8 +182,7 @@
       (dolist (n dir)
 	(unless (file-exists-p
 		 (setq file (expand-file-name (int-to-string n) pathname)))
-	  (rename-file (let ((buffer-file-name file))
-			 (make-auto-save-file-name)) file)))))
+	  (rename-file (nndraft-auto-save-file-name file) file)))))
   (nnoo-parent-function 'nndraft
 			'nnmh-request-group
 			(list group server dont-check)))
@@ -217,10 +218,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))))