From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Mon, 20 Sep 2010 16:35:18 +0000 (+0200)
Subject: Fix article moving from nnimap to other servers.
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=21f4b2f5b7ad9c32850a383a1988663ff8ac16b9

Fix article moving from nnimap to other servers.

When moving an article from nnimap, request the article first so the
accepting form has an article to accept.  Reported by Dan Christensen.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 278d4ea23..e93300e57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
 	(nnimap-request-delete-group): Implement group deletion.
 	(nnimap-transform-headers): Return the size of the entire message in
 	the Bytes header, not just the size of the first part.
+	(nnimap-request-move-article): When moving an article from nnimap,
+	request the article first so the accepting form has an article to
+	accept.  Reported by Dan Christensen.
 
 2010-09-20  David Edmondson  <dme@dme.org>  (tiny change)
 
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f9eaf173e..cc6f4f856 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -472,10 +472,11 @@ textual parts.")
 		    (nnimap-find-article-by-message-id
 		     internal-move-group message-id))))
 	(with-temp-buffer
-	  (let ((result (eval accept-form)))
-	    (when result
-	      (nnimap-delete-article article)
-	      result)))))))
+	  (when (nnimap-request-article article group server (current-buffer))
+	    (let ((result (eval accept-form)))
+	      (when result
+		(nnimap-delete-article article)
+		result))))))))
 
 (deffoo nnimap-request-expire-articles (articles group &optional server force)
   (cond