[Emacs-diffs] trunk r117654: * gnus-sum.el (gnus-summary-expire-articles): Functions registered to

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 117654
revision-id: address@hidden
parent: address@hidden
author: Eric Abrahamsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-06 00:33:37 +0000
message:
  * 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.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-sum.el          gnussum.el-20091113204419-o5vbwnq5f7feedwu-1137

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-08-06 00:31:29 +0000
+++ b/lisp/gnus/ChangeLog       2014-08-06 00:33:37 +0000
@@ -1,3 +1,9 @@
+2014-08-05  Eric Abrahamsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Allow `gcc-self' to be a list of

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2014-06-22 05:43:58 +0000
+++ b/lisp/gnus/gnus-sum.el     2014-08-06 00:33:37 +0000
@@ -10449,7 +10449,10 @@
                                        (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")))))