From 58475e05bfda0fb380711e828d14087ddad8b583 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 22 Sep 2010 22:07:05 +0200 Subject: [PATCH] If nnmail-expiry-wait is immediate, then expire all articles. --- lisp/ChangeLog | 5 +++++ lisp/nnimap.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 870cedc85..747edfdde 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-22 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-request-expire-articles): If nnmail-expiry-wait is + immediate, then expire all articles. + 2010-09-22 Julien Danjou * gnus-html.el (gnus-html-image-automatic-caching): Add custom diff --git a/lisp/nnimap.el b/lisp/nnimap.el index a8902b2cf..44869d6ab 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -502,7 +502,8 @@ not done by default on servers that doesn't support that command.") nil) (t (let ((deletable-articles - (if force + (if (or force + (eq nnmail-expiry-wait 'immediate)) articles (gnus-sorted-intersection articles -- 2.25.1