Re: nnimap-request-expire-articles bug? (Was Re: nnimap, expiry-target, nnmail-fancy-expiry-targets)

[Simon Josefsson <jas@extundo.com>]

Simon Josefsson <jas@extundo.com> writes:

> Yup.  Does this work?

Not likely, try this instead.  Still untested, but should at least
evaluate.

Index: nnimap.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nnimap.el,v
retrieving revision 6.37
diff -u -p -u -w -r6.37 nnimap.el
--- nnimap.el	2002/07/10 16:28:39	6.37
+++ nnimap.el	2002/07/29 12:14:39
@@ -1296,7 +1296,10 @@ function is generally only called when G
 (defun nnimap-expiry-target (arts group server)
   (unless (eq nnmail-expiry-target 'delete)
     (with-temp-buffer
-      (dolist (art (gnus-uncompress-sequence arts))
+      (dolist (art (imap-search (concat "UID " 
+					(imap-range-to-message-set
+					 (gnus-uncompress-sequence arts)))
+		    nnimap-server-buffer))
 	(nnimap-request-article art group server  (current-buffer))
 	;; hints for optimization in `nnimap-request-accept-article'
 	(let ((nnimap-current-move-article art)
@@ -1312,16 +1315,15 @@ function is generally only called when G
   (let ((artseq (gnus-compress-sequence articles)))
     (when (and artseq (nnimap-possibly-change-group group server))
       (with-current-buffer nnimap-server-buffer
-	(if force
-	    (progn
-	      (nnimap-expiry-target artseq group server)
-	      (when (imap-message-flags-add (imap-range-to-message-set artseq)
-					    "\\Deleted")
-		(setq articles nil)))
 	  (let ((days (or (and nnmail-expiry-wait-function
 			       (funcall nnmail-expiry-wait-function group))
 			  nnmail-expiry-wait)))
-	    (cond ((eq days 'immediate)
+	  (cond (force
+		 (nnimap-expiry-target artseq group server)
+		 (when (imap-message-flags-add
+			(imap-range-to-message-set artseq) "\\Deleted")
+		   (setq articles nil)))
+		((eq days 'immediate)
 		   (nnimap-expiry-target artseq group server)
 		   (when (imap-message-flags-add
 			  (imap-range-to-message-set artseq) "\\Deleted")
@@ -1340,7 +1342,7 @@ function is generally only called when G
 			    (gnus-compress-sequence oldarts))
 			   "\\Deleted")
 			  (setq articles (gnus-set-difference
-					  articles oldarts)))))))))))
+					articles oldarts))))))))))
   ;; return articles not deleted
   articles)