[gnus git] branch master updated: m0-11-35-gd54fcd4 =1= When expiring, tell functions where the articles are going

Lars Magne Ingebrigtsen <[email protected]> Tue, 05 Aug 2014 19:28:41 +0200
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  d54fcd4b80542c00aee84fe6742918593f0215cb (commit)
      from  a9e39e9dc0b816e3ba2798531ccd5e7bcb494075 (commit)


- Log -----------------------------------------------------------------
commit d54fcd4b80542c00aee84fe6742918593f0215cb
Author: Eric Abrahamsen <[email protected]>
Date:   Tue Aug 5 19:27:53 2014 +0200

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-05  Eric Abrahamsen  <[email protected]>
+
+	* 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  <[email protected]>
 
 	Don't mishandle year-9999 dates (Bug#18176).
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c0e099b..4f061cd 100644
--- 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")))))
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    6 ++++++
 lisp/gnus-sum.el |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project