* wl-expire.el (wl-summary-expire): Change messages.

        * wl-summary.el (wl-summary-delete-messages-on-buffer): Use
        `deleing-info' instead of "Deleting..."

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 625cc6e..2fb239b 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-17  Kenichi OKADA  <okada@opaopa.org>
+
+       * wl-expire.el (wl-summary-expire): Change messages.
+       * wl-summary.el (wl-summary-delete-messages-on-buffer): Use
+       `deleing-info' instead of "Deleting..."
+
 2000-10-15  Osamu Yamane <yamane@green.ocn.ne.jp>
 
        * wl-summary.el (wl-summary-refile-subr): Fix.

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index e148b62..2dfaa37 100644 (file)
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -481,6 +481,7 @@ Refile to archive folder followed message date."
   (interactive)
   (let ((folder (or folder-name wl-summary-buffer-folder-name))
        (alist wl-expire-alist)
+       (deleting-info "Expiring...")
        expires)
     (when (and (or (setq expires (wl-expire-folder-p folder))
                   (progn (and (interactive-p)
@@ -544,20 +545,24 @@ Refile to archive folder followed message date."
            (setq delete-list
                  (cond ((eq rm-type nil) nil)
                        ((eq rm-type 'remove)
-                        (car (wl-expire-delete folder delete-list msgdb)))
+                        (car (wl-expire-delete folder delete-list msgdb))
+                        (setq deleting-info "Deleting..."))
                        ((eq rm-type 'trash)
-                        (car (wl-expire-refile folder delete-list msgdb wl-trash-folder)))
+                        (car (wl-expire-refile folder delete-list msgdb wl-trash-folder))
+                        (setq deleting-info "Deleting..."))
                        ((eq rm-type 'hide)
-                        (car (wl-expire-hide folder delete-list msgdb)))
+                        (car (wl-expire-hide folder delete-list msgdb))
+                        (setq deleting-info "Hiding..."))
                        ((stringp rm-type)
-                        (car (wl-expire-refile folder delete-list msgdb rm-type)))
+                        (car (wl-expire-refile folder delete-list msgdb rm-type))
+                        (setq deleting-info "Refiling..."))
                        ((fboundp rm-type)
                         (apply rm-type (append (list folder delete-list msgdb)
                                                args)))
                        (t
                         (error "%s: invalid type" rm-type))))
            (when (and (not notsummary) delete-list)
-             (wl-summary-delete-messages-on-buffer delete-list t)
+             (wl-summary-delete-messages-on-buffer delete-list deleting-info)
              (wl-summary-folder-info-update)
              (wl-summary-set-message-modified)
              (wl-summary-set-mark-modified)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 6267512..075114e 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1931,7 +1931,7 @@ If optional argument is non-nil, checking is omitted."
          (setq i (1+ i))
          (if (or (zerop (% i 5)) (= i len))
              (elmo-display-progress
-              'wl-summary-delete-messages-on-buffer "Deleting..."
+              'wl-summary-delete-messages-on-buffer deleting-info
               (/ (* i 100) len))))
        (setq msgs (cdr msgs)))
       (when (eq wl-summary-buffer-view 'thread)
@@ -2217,7 +2217,7 @@ If optional argument is non-nil, checking is omitted."
        (message "Deleting...")
        (elmo-msgdb-delete-msgs folder delete-list msgdb t) ; reserve cache.
        ;;(set-buffer cur-buf)
-       (wl-summary-delete-messages-on-buffer delete-list t)
+       (wl-summary-delete-messages-on-buffer delete-list "Deleting...")
        (message "Deleting...done."))
       ;;(set-buffer cur-buf)
       ;; Change "New" marks to "Uncached Unread" marks.