From 5c502fc9d595690f3fc1cafa0503c42b2290492d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 26 Sep 2010 20:50:11 +0200 Subject: [PATCH] Fetch the expiry target for the correct group. --- lisp/ChangeLog | 6 ++++++ lisp/nndraft.el | 5 +++++ lisp/nnmh.el | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5a9ffb68..45e016111 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2010-09-26 Lars Magne Ingebrigtsen + * 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 313675c2f..16e0109cd 100644 --- 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 cdd540a99..984144e0d 100644 --- 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) -- 2.34.1