Synch up with main trunk, and prepare the release 2.12.0.

[elisp/wanderlust.git] / wl / wl-action.el

diff --git a/wl/wl-action.el b/wl/wl-action.el
index a4b2246..0d213cd 100644 (file)
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -478,6 +478,8 @@ Return number if put mark succeed"
                (+ failures (length (cdr (car dst-msgs))))))
        (setq dst-msgs (cdr dst-msgs)))
       (elmo-progress-clear 'elmo-folder-move-messages)
+      (if (<= failures 0)
+         (message "Refiling messages...done"))
       failures)))
 
 ;; Copy action
@@ -512,13 +514,15 @@ Return number if put mark succeed"
              ;; update buffer.
              (wl-summary-delete-copy-marks-on-buffer (cdr (car dst-msgs)))
              (setq wl-summary-buffer-temp-mark-list
-                   (wl-delete-associations 
+                   (wl-delete-associations
                     (cdr (car dst-msgs))
                     wl-summary-buffer-temp-mark-list)))
          (setq failures
                (+ failures (length (cdr (car dst-msgs))))))
        (setq dst-msgs (cdr dst-msgs)))
       (elmo-progress-clear 'elmo-folder-move-messages)
+      (if (<= failures 0)
+         (message "Copying messages...done"))
       failures)))
 
 ;; Prefetch.
@@ -543,7 +547,7 @@ Return number if put mark succeed"
 ;; Resend.
 (defun wl-summary-get-resend-address (action number)
   "Decide resend address."
-  (completing-read "Resend message to: " 'wl-complete-address))
+  (wl-address-read-from-minibuffer "Resend message to: "))
 
 (defun wl-summary-exec-action-resend (mark-list)
   (let ((failure 0))
@@ -604,6 +608,7 @@ Return number if put mark succeed"
        (goto-char beg)
        (when (looking-at "From ")
          (replace-match "X-From-Line: ")))
+      (run-hooks 'wl-summary-resend-hook)
       ;; Send it.
       (wl-draft-dispatch-message)
       (kill-buffer (current-buffer)))
@@ -659,16 +664,16 @@ Return number if put mark succeed"
   (let ((failures 0)
        collected pair action modified)
     (dolist (action wl-summary-mark-action-list)
-      (setq collected (cons (cons 
+      (setq collected (cons (cons
                             (wl-summary-action-mark action)
                             nil) collected)))
     (dolist (mark-info wl-summary-buffer-temp-mark-list)
-      (if numbers
-         (when (memq (nth 0 mark-info) numbers)
-           (setq pair (assoc (nth 1 mark-info) collected)))
-       (setq pair (assoc (nth 1 mark-info) collected)))
-      (setq pair (assoc (nth 1 mark-info) collected))
-      (setcdr pair (cons mark-info (cdr pair))))
+      (setq pair
+           (when (or (null numbers)
+                     (memq (nth 0 mark-info) numbers))
+             (assoc (nth 1 mark-info) collected)))
+      (if pair
+         (setcdr pair (cons mark-info (cdr pair)))))
     ;; collected is a pair of
     ;; mark-string and a list of mark-info
     (dolist (pair collected)
@@ -690,7 +695,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")