If nnmail-expiry-wait is immediate, then expire all articles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 870cedc..747edfd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-request-expire-articles): If nnmail-expiry-wait is
+       immediate, then expire all articles.
+
 2010-09-22  Julien Danjou  <julien@danjou.info>
 
        * gnus-html.el (gnus-html-image-automatic-caching): Add custom

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index a8902b2..44869d6 100644 (file)
--- 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