* 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.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 05309187548..832950772d2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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-07-31  Tassilo Horn  <tsdh@gnu.org>
 
         * gnus-msg.el (gnus-inews-insert-gcc): Allow `gcc-self' to be a list of
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c0e099ba3ca..4f061cd9f32 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/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")))))