Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a18186d..ebf2dea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-18  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-request-expire-articles): Compress sequence
+       before storing \Deleted mark on expired articles.
+
 2002-11-17   Markus Rost  <rost@math.ohio-state.edu>
 
        * gnus-sum.el (gnus-summary-goto-unread): Doc fix - escape open

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 72e38fa..65b85e7 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1366,7 +1366,8 @@ function is generally only called when Gnus is shutting down."
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
-                           (imap-range-to-message-set oldarts) "\\Deleted")
+                           (imap-range-to-message-set
+                            (gnus-compress-sequence oldarts)) "\\Deleted")
                       (setq articles (gnus-set-difference
                                       articles oldarts))))))
                ((numberp days)
@@ -1379,7 +1380,8 @@ function is generally only called when Gnus is shutting down."
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
-                           (imap-range-to-message-set oldarts) "\\Deleted")
+                           (imap-range-to-message-set
+                            (gnus-compress-sequence oldarts)) "\\Deleted")
                       (setq articles (gnus-set-difference
                                       articles oldarts)))))))))))
   ;; return articles not deleted