From ea8ec79569be72330aabe6bbc12ec36736a32bbf Mon Sep 17 00:00:00 2001 From: yoichi Date: Mon, 12 Jul 2004 14:40:51 +0000 Subject: [PATCH] * wl-action.el (wl-summary-exec): Print failure count. * elmo.el (elmo-folder-append-messages): Note on return value. * elmo-archive.el (elmo-folder-append-messages): Don't return message numbers which could not be appended. --- elmo/ChangeLog | 6 ++++++ elmo/elmo-archive.el | 10 ++++++---- elmo/elmo.el | 3 ++- wl/ChangeLog | 4 ++++ wl/wl-action.el | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 81bff7d..94af965 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,9 @@ +2004-07-12 Yoichi NAKAYAMA + + * elmo.el (elmo-folder-append-messages): Note on return value. + * elmo-archive.el (elmo-folder-append-messages): Don't return + message numbers which could not be appended. + 2004-07-11 Yoichi NAKAYAMA * elmo.el (elmo-message-fetch-threshold): Add nil to its range. diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el index b48c24f..47beb91 100644 --- a/elmo/elmo-archive.el +++ b/elmo/elmo-archive.el @@ -634,9 +634,10 @@ TYPE specifies the archiver's symbol." (elmo-folder-message-file-p src-folder) (elmo-folder-message-file-number-p src-folder)) ;; same-number(localdir, localnews) -> archive - (elmo-archive-append-files folder - (elmo-folder-message-file-directory src-folder) - numbers) + (unless (elmo-archive-append-files folder + (elmo-folder-message-file-directory src-folder) + numbers) + (setq numbers nil)) (elmo-progress-notify 'elmo-folder-move-messages (length numbers)) numbers) ((elmo-folder-message-make-temp-file-p src-folder) @@ -671,7 +672,8 @@ TYPE specifies the archiver's symbol." (if (elmo-archive-append-files folder base-dir files) - (elmo-delete-directory temp-dir))) + (elmo-delete-directory temp-dir) + (setq numbers nil))) (elmo-progress-notify 'elmo-folder-move-messages (length numbers)) numbers) (t (luna-call-next-method))))) diff --git a/elmo/elmo.el b/elmo/elmo.el index 1d8c7be..4eda3f6 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -396,7 +396,8 @@ Caller should make sure FOLDER is `writable'. SRC-FOLDER is the source ELMO folder structure. NUMBERS is the message numbers to be appended in the SRC-FOLDER. If second optional argument SAME-NUMBER is specified, -message number is preserved \(if possible\).") +message number is preserved \(if possible\). +Returns a list of message numbers successfully appended.") (luna-define-generic elmo-folder-pack-numbers (folder) "Pack message numbers of FOLDER.") diff --git a/wl/ChangeLog b/wl/ChangeLog index 5a6f5a4..7e1d86b 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,7 @@ +2004-07-12 Yoichi NAKAYAMA + + * wl-action.el (wl-summary-exec): Print failure count. + 2004-07-11 Yoichi NAKAYAMA * wl-summary.el (wl-summary-redisplay-internal): Change `defsubst' diff --git a/wl/wl-action.el b/wl/wl-action.el index a4b2246..6ec475a 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -690,7 +690,7 @@ Return number if put mark succeed" (setq wl-message-buffer nil)) (set-buffer-modified-p nil) (when (> failures 0) - (format "%d execution(s) were failed" failures)))) + (message "%d execution(s) were failed" failures)))) (defun wl-summary-exec-region (beg end) (interactive "r") -- 1.7.10.4