Fetch the expiry target for the correct group.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5a9ffb..45e0161 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnmh.el (nnmh-request-expire-articles): Don't try to fetch the expiry
+       target here, because we don't know the Gnus name of the group.
+
+       * nndraft.el (nndraft-request-expire-articles): Fetch the expiry target
+       for the correct group.
+
        * gnus-ems.el (gnus-create-image): Ignore all image-creation errors.
 
        * gnus.el (gnus): Give a final warning after startup.

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 313675c..16e0109 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -222,6 +222,11 @@ are generated if and only if they are also in `message-draft-headers'.")
 (deffoo nndraft-request-expire-articles (articles group &optional server force)
   (nndraft-possibly-change-group group)
   (let* ((nnmh-allow-delete-final t)
+        ((nnmail-expiry-target
+          (or (gnus-group-find-parameter
+               (gnus-group-prefixed-name "nndraft" (list 'nndraft server))
+               'expiry-target t)
+              nnmail-expiry-target)))
         (res (nnoo-parent-function 'nndraft
                                    'nnmh-request-expire-articles
                                    (list articles group server force)))

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index cdd540a..984144e 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -258,9 +258,6 @@ as unread by Gnus.")
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
   (let ((is-old t)
-       (nnmail-expiry-target
-        (or (gnus-group-find-parameter newsgroup 'expiry-target t)
-            nnmail-expiry-target))
        article rest mod-time)
     (nnheader-init-server-buffer)