Synch with Oort Gnus.

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

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 71531ee..e40e7cd 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -33,9 +33,6 @@
 (require 'gnus-start)
 (require 'nnmh)
 (require 'nnoo)
-(eval-when-compile
-  ;; This is just to shut up the byte-compiler.
-  (defalias 'nndraft-request-group 'ignore))
 
 (nnoo-declare nndraft
   nnmh)
@@ -129,7 +126,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)
@@ -165,6 +164,24 @@
     (clear-visited-file-modtime)
     article))
 
+(deffoo nndraft-request-group (group &optional server dont-check)
+  (nndraft-possibly-change-group group)
+  (unless dont-check
+    (let* ((pathname (nnmail-group-pathname group nndraft-directory))
+          (file-name-coding-system nnmail-pathname-coding-system)
+          dir file)
+      (nnheader-re-read-dir pathname)
+      (setq dir (mapcar (lambda (name) (string-to-int (substring name 1)))
+                       (directory-files pathname nil "^#[0-9]+#$" t)))
+      (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)))))
+  (nnoo-parent-function 'nndraft
+                       'nnmh-request-group
+                       (list group server dont-check)))
+
 (deffoo nndraft-request-expire-articles (articles group &optional server force)
   (nndraft-possibly-change-group group)
   (let* ((nnmh-allow-delete-final t)