Changes committed gnus/lisp (ChangeLog nnfolder.el nnml.el)

Modified: ChangeLog nnfolder.el nnml.el

Revert last changes.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1920 gnus/lisp/ChangeLog:7.1921
--- ChangeLog:7.1920	Fri Oct  3 01:34:37 2008
+++ ChangeLog	Fri Oct  3 01:44:37 2008
@@ -1,11 +1,3 @@
-2008-10-02  Katsumi Yamaoka  <[email protected]>
-
-	* nnml.el (nnml-request-expire-articles): Expand nnmail-expiry-target
-	to an actual expiry target first if it is a function.  Suggested by
-	Phillip Lord <[email protected]>.
-
-	* nnfolder.el (nnfolder-request-expire-articles): Ditto.
-
 2008-10-01  Katsumi Yamaoka  <[email protected]>
 
 	* lpath.el: Fbind codepage-setup for Emacs 23.
Index: nnfolder.el
diff -u gnus/lisp/nnfolder.el:7.25 gnus/lisp/nnfolder.el:7.26
--- nnfolder.el:7.25	Fri Oct  3 01:34:37 2008
+++ nnfolder.el	Fri Oct  3 01:44:37 2008
@@ -464,14 +464,14 @@
 		       (buffer-substring
 			(point) (progn (end-of-line) (point)))
 		       force nnfolder-inhibit-expiry))
-	    (setq target (if (functionp nnmail-expiry-target)
-			     (funcall nnmail-expiry-target newsgroup)
-			   nnmail-expiry-target))
+	    (setq target nnmail-expiry-target)
 	    (unless (eq target 'delete)
 	      (with-temp-buffer
 		(nnfolder-request-article (car maybe-expirable)
 					  newsgroup server (current-buffer))
 		(let ((nnfolder-current-directory nil))
+		  (when (functionp target)
+		    (setq target (funcall target newsgroup)))
 		  (if (and target
 			   (or (gnus-request-group target)
 			       (gnus-request-create-group target)))
Index: nnml.el
diff -u gnus/lisp/nnml.el:7.32 gnus/lisp/nnml.el:7.33
--- nnml.el:7.32	Fri Oct  3 01:34:37 2008
+++ nnml.el	Fri Oct  3 01:44:37 2008
@@ -355,15 +355,15 @@
 						      nnml-inhibit-expiry)))
 	  (progn
 	    ;; Allow a special target group.
-	    (setq target (if (functionp nnmail-expiry-target)
-			     (funcall nnmail-expiry-target group)
-			   nnmail-expiry-target))
+	    (setq target nnmail-expiry-target)
 	    (unless (eq target 'delete)
 	      (with-temp-buffer
 		(nnml-request-article number group server (current-buffer))
 		(let (nnml-current-directory
 		      nnml-current-group
 		      nnml-article-file-alist)
+		  (when (functionp target)
+		    (setq target (funcall target group)))
 		  (if (and target
 			   (or (gnus-request-group target)
 			       (gnus-request-create-group target)))