Only delete articles immediately if the target is 'delete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e2dfa6..84baaff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * nnimap.el (nnimap-request-group): When we have zero articles, return
        the right data to Gnus.
+       (nnimap-request-expire-articles): Only delete articles immediately if
+       the target is 'delete.
 
        * gnus-sum.el (gnus-summary-move-article): When respooling to the same
        method, this would bug out.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 7822f50..82c9976 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -490,7 +490,8 @@ textual parts.")
   (cond
    ((not (nnimap-possibly-change-group group server))
     articles)
-   (force
+   ((and force
+        (eq nnmail-expiry-target 'delete))
     (unless (nnimap-delete-article articles)
       (message "Article marked for deletion, but not expunged."))
     nil)