-(deffoo nndraft-request-group (group &optional server dont-check)
- (prog1
- (nndraft-execute-nnmh-command
- `(nnmh-request-group group "" ,dont-check))
- (nnheader-report 'nndraft nnmh-status-string)))
-
-(deffoo nndraft-request-list (&optional server dir)
- (nndraft-execute-nnmh-command
- `(nnmh-request-list nil ,dir)))
-
-(deffoo nndraft-request-newgroups (date &optional server)
- (nndraft-execute-nnmh-command
- `(nnmh-request-newgroups ,date ,server)))
-
-(deffoo nndraft-request-expire-articles
- (articles group &optional server force)
- (let ((res (nndraft-execute-nnmh-command
- `(nnmh-request-expire-articles
- ',articles group ,server ,force)))
- article)
+(deffoo nndraft-request-group (group &optional server dont-check info)
+ (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-number (substring name 1)))
+ (ignore-errors (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 (nndraft-auto-save-file-name file) file)))))
+ (nnoo-parent-function 'nndraft
+ 'nnmh-request-group
+ (list group server dont-check)))
+
+(deffoo nndraft-request-move-article (article group server accept-form
+ &optional last move-is-internal)
+ (nndraft-possibly-change-group group)
+ (let ((buf (get-buffer-create " *nndraft move*"))
+ result)
+ (and
+ (nndraft-request-article article group server)
+ (with-current-buffer buf
+ (erase-buffer)
+ (insert-buffer-substring nntp-server-buffer)
+ (setq result (eval accept-form))
+ (kill-buffer (current-buffer))
+ result)
+ (null (nndraft-request-expire-articles (list article) group server 'force))
+ result)))
+
+(deffoo nndraft-request-expire-articles (articles group &optional server force)
+ (nndraft-possibly-change-group group)
+ (let* ((nnmh-allow-delete-final t)
+ (res (nnoo-parent-function 'nndraft
+ 'nnmh-request-expire-articles
+ (list articles group server force)))
+ article)