From 87c8f059d56ddf756626a5f31bca02b843c85ceb Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 2 Oct 2008 23:44:37 +0000 Subject: [PATCH] Revert last changes. --- lisp/ChangeLog | 8 -------- lisp/nnfolder.el | 6 +++--- lisp/nnml.el | 6 +++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a5e55ba6..f8e36dc20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,3 @@ -2008-10-02 Katsumi Yamaoka - - * 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 . - - * nnfolder.el (nnfolder-request-expire-articles): Ditto. - 2008-10-01 Katsumi Yamaoka * lpath.el: Fbind codepage-setup for Emacs 23. diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index f48e255f3..36e057148 100644 --- 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 1b7f7f74a..30a54543a 100644 --- 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))) -- 2.25.1