Revert last changes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a5e55b..f8e36dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,3 @@
-2008-10-02  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * 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 <phillip.lord@newcastle.ac.uk>.
-
-       * nnfolder.el (nnfolder-request-expire-articles): Ditto.
-
 2008-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind codepage-setup for Emacs 23.

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index f48e255..36e0571 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -464,14 +464,14 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
                       (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)))

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 1b7f7f7..30a5454 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -355,15 +355,15 @@ non-nil.")
                                                      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)))