Re: [Patch] tell expiry-hook functions where expired messages are going

[Alan Schmitt <alan.schmitt@polytechnique.org>]

[-- Attachment #1.1: Type: text/plain, Size: 673 bytes --]

Hello,

On 2014-08-06 20:14, Katsumi Yamaoka <yamaoka@jpl.org> writes:

> I've reverted the change in the Gnus git master and the Emacs trunk.
> Please reinstall the feature if you get a good solution.  I have
> no idea for it so far, sorry.

Here is an adaptation of Eric's patch that takes these problems into
account. As the target is either a string, the 'delete symbol, or
a function, I test those in turn. In the case it's a function, the
result from the call should be either a string or a 'delete symbol or
a string. In the case it's a 'delete symbole, the hook is called with
'nil' as target.

Eric: I reused your log message, I hope you don't mind.

Best,

Alan


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-Tell-expiry-hook-functions-where-the-message-is-goin.patch --]
[-- Type: text/x-patch, Size: 1710 bytes --]

From d79800074d63ff4242402ff7f7af7b2c9afdc6eb Mon Sep 17 00:00:00 2001
From: Alan Schmitt <alan.schmitt@polytechnique.org>
Date: Mon, 11 Aug 2014 16:01:06 +0200
Subject: [PATCH] Tell expiry-hook functions where the message is going

* lisp/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.
---
 lisp/gnus-sum.el | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c0e099b..d54fe91 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10444,13 +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
-					'delete
-					(gnus-data-header
-					 (assoc article (gnus-data-list nil)))
-					gnus-newsgroup-name
-					nil
-					nil)))))))
+		    (run-hook-with-args
+		     'gnus-summary-article-expire-hook
+		     'delete
+		     (gnus-data-header (assoc article (gnus-data-list nil)))
+		     gnus-newsgroup-name
+		     (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")))))
 
 (defun gnus-summary-expire-articles-now ()
-- 
2.0.3


[-- Attachment #1.3: Type: text/plain, Size: 44 bytes --]



-- 
OpenPGP Key ID : 040D0A3B4ED2E5C7

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 494 bytes --]