From 903b1d2b24606d12957a37600d8a60a78b4d3e56 Mon Sep 17 00:00:00 2001 From: teranisi Date: Wed, 16 Jul 2003 05:30:21 +0000 Subject: [PATCH] * wl-summary.el (wl-summary-delete-messages-on-buffer): Don't display buffer line deleting progress. (wl-summary-mode-map): Bind wl-thread-dispose, Changed binding for wl-thread-delete. * wl-action.el (wl-summary-register-target-mark): Fixed argument. (wl-summary-target-mark-set-action): Fixed. (wl-summary-define-mark-action): Fixed quotation. (wl-summary-move-mark-list-messages): Display message. (wl-summary-define-mark-action): Define thread functions. (wl-summary-exec-action-refile): Changed message. (wl-summary-exec): Ditto. --- wl/ChangeLog | 9 +++++++++ wl/wl-action.el | 46 +++++++++++++++++++++++++++++++--------------- wl/wl-summary.el | 19 ++++++++++--------- 3 files changed, 50 insertions(+), 24 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index bf8b567..17a9e4f 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,8 +1,17 @@ 2003-07-16 Yuuichi Teranishi + * wl-summary.el (wl-summary-delete-messages-on-buffer): Don't display + buffer line deleting progress. + (wl-summary-mode-map): Bind wl-thread-dispose, Changed binding for + wl-thread-delete. + * wl-action.el (wl-summary-register-target-mark): Fixed argument. (wl-summary-target-mark-set-action): Fixed. (wl-summary-define-mark-action): Fixed quotation. + (wl-summary-move-mark-list-messages): Display message. + (wl-summary-define-mark-action): Define thread functions. + (wl-summary-exec-action-refile): Changed message. + (wl-summary-exec): Ditto. 2003-07-15 Mito diff --git a/wl/wl-action.el b/wl/wl-action.el index cf4009c..87613e8 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -264,6 +264,7 @@ Return number if put mark succeed" (setq refile-len (length refiles)) (goto-char start) ; avoid moving cursor to ; the bottom line. + (message message) (when (> refile-len elmo-display-progress-threshold) (elmo-progress-set 'elmo-folder-move-messages refile-len message)) @@ -289,6 +290,7 @@ Return number if put mark succeed" (setq wl-summary-buffer-temp-mark-list (delq mark-info wl-summary-buffer-temp-mark-list)))) (elmo-progress-clear 'elmo-folder-move-messages) + (message (concat message "done")) (wl-summary-set-message-modified) ;; Return the operation failed message numbers. (if result @@ -365,7 +367,23 @@ Return number if put mark succeed" `(lambda () ,(wl-summary-action-docstring action) (interactive) - (wl-summary-target-mark-set-action (quote ,action)))))) + (wl-summary-target-mark-set-action (quote ,action)))) + (fset (intern (format "wl-thread-%s" + (wl-summary-action-symbol action))) + `(lambda (arg) + ,(wl-summary-action-docstring action) + (interactive "P") + (wl-thread-call-region-func + (quote ,(intern (format "wl-summary-%s-region" + (wl-summary-action-symbol action)))) + arg) + (if arg + (wl-summary-goto-top-of-current-thread)) + (if (not wl-summary-move-direction-downward) + (wl-summary-prev) + (wl-thread-goto-bottom-of-sub-thread) + (if wl-summary-buffer-disp-msg + (wl-summary-redisplay))))))) (defun wl-summary-get-dispose-folder (folder) (if (string= folder wl-trash-folder) @@ -432,20 +450,20 @@ Return number if put mark succeed" (goto-char start) ; avoid moving cursor to the bottom line. (when (> refile-len elmo-display-progress-threshold) (elmo-progress-set 'elmo-folder-move-messages - refile-len "Moving messages...")) + refile-len "Refiling messages...")) (while dst-msgs (setq result nil) (condition-case nil (setq result (elmo-folder-move-messages - wl-summary-buffer-elmo-folder - (cdr (car dst-msgs)) - (wl-folder-get-elmo-folder - (car (car dst-msgs))) - (wl-summary-buffer-msgdb) - (not (null (cdr dst-msgs))) - nil ; no-delete - nil ; same-number - t)) + wl-summary-buffer-elmo-folder + (cdr (car dst-msgs)) + (wl-folder-get-elmo-folder + (car (car dst-msgs))) + (wl-summary-buffer-msgdb) + (not (null (cdr dst-msgs))) + nil ; no-delete + nil ; same-number + t)) (error nil)) (if result ; succeeded. (progn @@ -617,10 +635,8 @@ Return number if put mark succeed" (wl-summary-toggle-disp-msg 'off) (setq wl-message-buffer nil)) (set-buffer-modified-p nil) - (message "Executing...done%s" - (if (> failures 0) - (format " (%d failed)" failures) - "")))) + (when (> failures 0) + (format "%d execution(s) were failed" failures)))) (defun wl-summary-exec-region (beg end) (interactive "r") diff --git a/wl/wl-summary.el b/wl/wl-summary.el index b6215b8..1e89bd0 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -475,7 +475,8 @@ See also variable `wl-use-petname'." (define-key wl-summary-mode-map "t*" 'wl-thread-target-mark) (define-key wl-summary-mode-map "to" 'wl-thread-refile) (define-key wl-summary-mode-map "tO" 'wl-thread-copy) - (define-key wl-summary-mode-map "td" 'wl-thread-delete) + (define-key wl-summary-mode-map "td" 'wl-thread-dispose) + (define-key wl-summary-mode-map "tD" 'wl-thread-delete) (define-key wl-summary-mode-map "tu" 'wl-thread-unmark) (define-key wl-summary-mode-map "t!" 'wl-thread-mark-as-unread) (define-key wl-summary-mode-map "t$" 'wl-thread-mark-as-important) @@ -1687,7 +1688,7 @@ If ARG is non-nil, checking is omitted." (msgs2 msgs) (len (length msgs)) (i 0) - (deleting-info (or deleting-info "Deleting...")) + ;(deleting-info (or deleting-info "Deleting...")) update-list) (elmo-kill-buffer wl-summary-search-buf-name) (while msgs @@ -1705,17 +1706,17 @@ If ARG is non-nil, checking is omitted." (delete-char 1) ; delete '\n' (setq wl-summary-buffer-number-list (delq (car msgs) wl-summary-buffer-number-list))))) - (when (> len elmo-display-progress-threshold) - (setq i (1+ i)) - (if (or (zerop (% i 5)) (= i len)) - (elmo-display-progress - 'wl-summary-delete-messages-on-buffer deleting-info - (/ (* i 100) len)))) +; (when (> len elmo-display-progress-threshold) +; (setq i (1+ i)) +; (if (or (zerop (% i 5)) (= i len)) +; (elmo-display-progress +; 'wl-summary-delete-messages-on-buffer deleting-info +; (/ (* i 100) len)))) (setq msgs (cdr msgs))) (when (eq wl-summary-buffer-view 'thread) (wl-thread-update-line-msgs (elmo-uniq-list update-list)) (wl-thread-cleanup-symbols msgs2)) - (message (concat deleting-info "done")) + ;;(message (concat deleting-info "done")) (wl-summary-count-unread) (wl-summary-update-modeline) (wl-folder-update-unread -- 1.7.10.4