Allow expiring nnimap to a group again

* nnmail.el (nnmail-expiry-target-group): Supply the info structure to
`gnus-request-group'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64a9673..070b970 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnmail.el (nnmail-expiry-target-group): Supply the info structure to
+       `gnus-request-group'.
+

 2015-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-browse-html-save-cid-content)
 2015-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-browse-html-save-cid-content)

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 62fcc2d..5c54810 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1921,7 +1921,7 @@ If TIME is nil, then return the cutoff time for oldness instead."
     (when (functionp target)
       (setq target (funcall target group)))
     (unless (eq target 'delete)
     (when (functionp target)
       (setq target (funcall target group)))
     (unless (eq target 'delete)

-      (when (or (gnus-request-group target)
+      (when (or (gnus-request-group target nil nil (gnus-get-info target))

                (gnus-request-create-group target))
        (let ((group-art (gnus-request-accept-article target nil nil t)))
          (when (and (consp group-art)
                (gnus-request-create-group target))
        (let ((group-art (gnus-request-accept-article target nil nil t)))
          (when (and (consp group-art)