From 19c4c63d432dcb6d1019ee853b5eac06fa13145f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 14 Aug 2000 08:56:09 +0000 Subject: [PATCH] Synch with Gnus. --- lisp/ChangeLog | 21 +++++++++++++++++++++ lisp/gnus-sum.el | 3 +++ lisp/nnmail.el | 2 +- lisp/nnml.el | 9 +++++---- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3c38576..8a1338c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2000-08-14 Rod Whitby + + * nnmail.el (nnmail-expiry-target-group): Fix the call to + gnus-request-accept-article so that body encoding is *not* done. + Encoding is not done on incoming mail, so why should it be done on + expired mail? + + +2000-08-14 Rod Whitby + + * nnml.el (nnml-request-expire-articles): Fix the calls to + nnml-request-article (the filename was being passed instead of the + article number) and nnmail-expiry-target-group + (nnml-current-directory is changed by nnml-request-accept-article, + causing it to be incorrect for the next article to be expired). + +2000-08-14 Rod Whitby + + * gnus-sum.el (gnus-summary-expire-articles): Fix the handling of + expiry-target group parameters. + 2000-08-13 18:53:08 Lars Magne Ingebrigtsen * gnus-topic.el (gnus-topic-select-group): Touch the dribble diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index fc4ba15..3d3f5e9 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -7850,6 +7850,9 @@ This will be the case if the article has both been mailed and posted." (expiry-wait (if now 'immediate (gnus-group-find-parameter gnus-newsgroup-name 'expiry-wait))) + (nnmail-expiry-target + (or (gnus-group-find-parameter gnus-newsgroup-name 'expiry-target) + nnmail-expiry-target)) es) (when expirable ;; There are expirable articles in this group, so we run them diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 230aa20..6a3dcd9 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1626,7 +1626,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (when (nnheader-functionp target) (setq target (funcall target group))) (unless (eq target 'delete) - (gnus-request-accept-article target))) + (gnus-request-accept-article target nil nil t))) (defun nnmail-check-syntax () "Check (and modify) the syntax of the message in the current buffer." diff --git a/lisp/nnml.el b/lisp/nnml.el index 7d5ac45..7416afb 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -295,12 +295,13 @@ all. This may very well take some time.") ;; Allow a special target group. (unless (eq nnmail-expiry-target 'delete) (with-temp-buffer - (nnml-request-article article group server + (nnml-request-article number group server (current-buffer)) - (nnmail-expiry-target-group - nnmail-expiry-target group))) + (let ((nnml-current-directory nil)) + (nnmail-expiry-target-group + nnmail-expiry-target group)))) (nnheader-message 5 "Deleting article %s in %s" - article group) + number group) (condition-case () (funcall nnmail-delete-file-function article) (file-error -- 1.7.10.4