From 1b7d2a5c713dcdb576026fdc01b17e5ef26bd31f Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 21 Sep 2010 18:48:21 +0200 Subject: [PATCH] Only delete articles immediately if the target is 'delete. --- lisp/ChangeLog | 2 ++ lisp/nnimap.el | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e2dfa629..84baaff12 100644 --- 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 7822f5003..82c9976c7 100644 --- 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) -- 2.25.1