[gnus git] branch master updated: m0-11-38-gb39a97d =1= gnus-sum.el (gnus-summary-expire-articles): Reinstall improved version of the 2014-08-05 change

       via  b39a97d475e871fbb93d03088a3ccefc6f077a75 (commit)
      from  21a85c7b95dac62c033603271ee5272c9fc12013 (commit)


- Log -----------------------------------------------------------------
commit b39a97d475e871fbb93d03088a3ccefc6f077a75
Author: Alan Schmitt <[email protected]>
Date:   Thu Aug 14 11:30:34 2014 +0000

    gnus-sum.el (gnus-summary-expire-articles): Reinstall improved version of the 2014-08-05 change

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3307433..85be195 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-14  Alan Schmitt  <[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-12  Stefan Monnier  <[email protected]>
 
 	* gnus-art.el (gnus-hidden-properties): Drop the evil `intangible'.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c0e099b..db0242e 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10444,12 +10444,18 @@ This will be the case if the article has both been mailed and posted."
 		  (when (and (not (memq article es))
 			     (gnus-data-find article))
 		    (gnus-summary-mark-article article gnus-canceled-mark)
-		    (run-hook-with-args 'gnus-summary-article-expire-hook
+		    (run-hook-with-args
+		     'gnus-summary-article-expire-hook
 		     'delete
-					(gnus-data-header
-					 (assoc article (gnus-data-list nil)))
+		     (gnus-data-header (assoc article (gnus-data-list nil)))
 		     gnus-newsgroup-name
-					nil
+		     (cond
+		      ((stringp nnmail-expiry-target) nnmail-expiry-target)
+		      ((eq nnmail-expiry-target 'delete) nil)
+		      (t
+		       (let ((rescall (funcall nnmail-expiry-target
+					       gnus-newsgroup-name)))
+			 (if (stringp rescall) rescall nil))))
 		     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 |   20 +++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

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