+2014-08-14 Alan Schmitt <alan.schmitt@polytechnique.org>
+
+ * 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 <monnier@iro.umontreal.ca>
* gnus-art.el (gnus-hidden-properties): Drop the evil `intangible'.
(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 ()