[Emacs-diffs] trunk r117705: gnus-sum.el (gnus-summary-expire-articles): Reinstall improved version of the 2014-08-05 change

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 117705
revision-id: address@hidden
parent: address@hidden
author: Alan Schmitt <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2014-08-14 11:31:23 +0000
message:
  gnus-sum.el (gnus-summary-expire-articles): Reinstall improved version of the 
2014-08-05 change
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-13 14:16:48 +0000
+++ b/lisp/gnus/ChangeLog       2014-08-14 11:31:23 +0000
@@ -1,3 +1,9 @@
+2014-08-14  Alan Schmitt  <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-08-12  Stefan Monnier  <address@hidden>
 
        * gnus-art.el (gnus-hidden-properties): Drop the evil `intangible'.

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2014-08-06 11:14:08 +0000
+++ b/lisp/gnus/gnus-sum.el     2014-08-14 11:31:23 +0000
@@ -10444,13 +10444,19 @@
                  (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 ()