From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 6 Aug 2014 11:14:08 +0000 (+0000)
Subject: gnus-sum.el (gnus-summary-expire-articles): Revert last change
X-Git-Tag: emacs-25.0.90~2635^2~679^2~516
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2416ad64a4e47094ad26c254a85addbf28211910;p=emacs.git

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 832950772d2..a294b4c42e2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4f061cd9f32..c0e099ba3ca 100644
--- 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")))))