(nnfolder-request-expire-articles): Return the list of unexpired articles.

This fixes the regression that led expiry marks to disappear from
nnfolder groups.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c69e585..0eef4da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-22  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnfolder.el (nnfolder-request-expire-articles): Return the list of
+       unexpired articles.  This fixes the regression that led expiry marks to
+       disappear from nnfolder groups.
+
 2011-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes):

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index a264bc2..826de8b 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -488,8 +488,8 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
       (nnfolder-save-buffer)
       (nnfolder-adjust-min-active newsgroup)
       (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
-      (gnus-sorted-difference articles (nreverse deleted-articles)))
-    (nnfolder-save-all-buffers)))
+      (nnfolder-save-all-buffers)
+      (gnus-sorted-difference articles (nreverse deleted-articles)))))
 
 (deffoo nnfolder-request-move-article (article group server accept-form
                                               &optional last move-is-internal)