When expiring, tell functions where the articles are going

* gnus-sum.el (gnus-summary-expire-articles): Functions registered to
the gnus-summary-article-expire-hook should be told where the function
is going. In particular, the Gnus registry might want to know.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 333c3b6..acde130 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-05  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+       * gnus-sum.el (gnus-summary-expire-articles): Functions registered to
+       the gnus-summary-article-expire-hook should be told where the function
+       is going. In particular, the Gnus registry might want to know.
+
 2014-08-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        Don't mishandle year-9999 dates (Bug#18176).

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c0e099b..4f061cd 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10449,7 +10449,10 @@ This will be the case if the article has both been mailed and posted."
                                        (gnus-data-header
                                         (assoc article (gnus-data-list nil)))
                                        gnus-newsgroup-name
-                                       nil
+                                       (if (fboundp nnmail-expiry-target)
+                                           (funcall nnmail-expiry-target
+                                                    gnus-newsgroup-name)
+                                         nnmail-expiry-target)
                                        nil)))))))
        (gnus-message 6 "Expiring articles...done")))))