gnus-sum.el (gnus-summary-expire-articles): Revert last change

2416ad64 · Katsumi Yamaoka · 345eec29 · 2416ad64 · 2416ad64
Commit 2416ad64 authored Aug 06, 2014 by Katsumi Yamaoka
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +4 -0

lisp/gnus/gnus-sum.el lisp/gnus/gnus-sum.el +1 -4

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+2014-08-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-sum.el (gnus-summary-expire-articles): Revert.
+
 2014-08-05  Eric Abrahamsen  <eric@ericabrahamsen.net>
  
 	* gnus-sum.el (gnus-summary-expire-articles): Functions registered to

--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -10449,10 +10449,7 @@ 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
-					(if (fboundp nnmail-expiry-target)
-					    (funcall nnmail-expiry-target
-						     gnus-newsgroup-name)
-					  nnmail-expiry-target)
+					nil
 					nil)))))))
 	(gnus-message 6 "Expiring articles...done")))))