From: yamaoka <yamaoka>
Date: Sun, 16 Feb 2003 23:52:38 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~64
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2201eac09a2842f4cca2a54e014219e9b181b48;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30ba086..a2140e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nndraft.el (nndraft-request-move-article): Bind
+	nnmh-allow-delete-final to t.
+
 2003-02-14  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* mm-uu.el (mm-uu-uu-filename): Fix use of character constant.
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index bf014d3..aa90e6a 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -527,18 +527,22 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 	   (gnus-get-function gnus-command-method 'request-expire-articles)
 	   articles (gnus-group-real-name group) (nth 1 gnus-command-method)
 	   force)))
-    (when (and gnus-agent gnus-agent-cache (gnus-agent-method-p gnus-command-method))
+    (when (and gnus-agent gnus-agent-cache
+	       (gnus-agent-method-p gnus-command-method))
       (let ((expired-articles (gnus-sorted-difference articles not-deleted)))
         (when expired-articles
           (gnus-agent-expire expired-articles group 'force))))
     not-deleted))
 
-(defun gnus-request-move-article (article group server accept-function &optional last)
+(defun gnus-request-move-article (article group server accept-function
+					  &optional last)
   (let* ((gnus-command-method (gnus-find-method-for-group group))
-	 (result (funcall (gnus-get-function gnus-command-method 'request-move-article)
+	 (result (funcall (gnus-get-function gnus-command-method
+					     'request-move-article)
 			  article (gnus-group-real-name group)
 			  (nth 1 gnus-command-method) accept-function last)))
-    (when (and result gnus-agent gnus-agent-cache (gnus-agent-method-p gnus-command-method))
+    (when (and result gnus-agent gnus-agent-cache
+	       (gnus-agent-method-p gnus-command-method))
       (gnus-agent-expire (list article) group 'force))
     result))
 
diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 9ca7314..bd27cfe 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -196,6 +196,13 @@
 			'nnmh-request-group
 			(list group server dont-check)))
 
+(deffoo nndraft-request-move-article (article group server
+					      accept-form &optional last)
+  (nndraft-possibly-change-group group)
+  (let ((nnmh-allow-delete-final t))
+    (nnoo-parent-function 'nndraft 'nndraft-request-move-article
+			  (list article group server accept-form last))))
+
 (deffoo nndraft-request-expire-articles (articles group &optional server force)
   (nndraft-possibly-change-group group)
   (let* ((nnmh-allow-delete-final t)
@@ -286,8 +293,7 @@
    nnmh-request-group
    nnmh-close-group
    nnmh-request-list
-   nnmh-request-newsgroups
-   nnmh-request-move-article))
+   nnmh-request-newsgroups))
 
 (provide 'nndraft)
 
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index d81bc2d..d326c06 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -297,8 +297,8 @@ as unread by Gnus.")
 (deffoo nnmh-close-group (group &optional server)
   t)
 
-(deffoo nnmh-request-move-article
-    (article group server accept-form &optional last)
+(deffoo nnmh-request-move-article (article group server
+					   accept-form &optional last)
   (let ((buf (get-buffer-create " *nnmh move*"))
 	result)
     (and