* wl-summary.el (wl-summary-goto-folder-subr): Rescan if scan-type is rescan.

(wl-summary-delete-all-temp-marks): Remove scored mark too.

* wl-action.el (wl-summary-unset-mark): Added optional argument FORCE.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 03a6197..e0f5eb6 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-goto-folder-subr): Rescan if
+       scan-type is rescan.
+       (wl-summary-delete-all-temp-marks): Remove scored mark too.
+
+       * wl-action.el (wl-summary-unset-mark): Added optional argument FORCE.
+
 2003-08-12  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-action.el (wl-summary-print-argument): Fixed last change.

diff --git a/wl/wl-action.el b/wl/wl-action.el
index a138d3e..a77b6c6 100644 (file)
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -212,11 +212,12 @@ Return number if put mark succeed"
       mark-list)))
 
 ;; Unset mark
-(defun wl-summary-unset-mark (&optional number interactive)
+(defun wl-summary-unset-mark (&optional number interactive force)
   "Unset temporary mark of the message with NUMBER.
 NUMBER is the message number to unset the mark.
 If not specified, the message on the cursor position is treated.
 Optional INTERACTIVE is non-nil when it should be called interactively.
+If optional FORCE is non-nil, remove scored mark too.
 Return number if put mark succeed"
   (interactive)
   (save-excursion
@@ -238,7 +239,7 @@ Return number if put mark succeed"
       (when visible
        (unless (string= mark " ")
          (wl-summary-put-temp-mark
-          (or (wl-summary-get-score-mark number)
+          (or (unless force (wl-summary-get-score-mark number))
               " "))
          (setq action (assoc mark wl-summary-mark-action-list))
          (when wl-summary-highlight

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 2cdcbf5..70f68e4 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2251,6 +2251,8 @@ If ARG, without confirm."
               ((eq scan-type 'all)
                (wl-summary-sync 'unset-cursor "all"))
               ((eq scan-type 'no-sync))
+              ((eq scan-type 'rescan)
+               (wl-summary-rescan))
               ((or (eq scan-type 'force-update)
                    (eq scan-type 'update))
                (setq mes (wl-summary-sync-force-update
@@ -2648,13 +2650,14 @@ If ARG, exit virtual folder."
   "Erase all temp marks from buffer."
   (interactive)
   (when (or wl-summary-buffer-target-mark-list
-           wl-summary-buffer-temp-mark-list)
+           wl-summary-buffer-temp-mark-list
+           wl-summary-scored)
     (save-excursion
       (goto-char (point-min))
       (unless no-msg
        (message "Unmarking..."))
       (while (not (eobp))
-       (wl-summary-unset-mark)
+       (wl-summary-unset-mark nil nil t)
        (forward-line 1))
       (unless no-msg
        (message "Unmarking...done"))
@@ -3227,7 +3230,8 @@ Return non-nil if the mark is updated"
                (wl-summary-delete-all-temp-marks 'no-msg)
                (encode-coding-region
                 (point-min) (point-max)
-                (or (and wl-on-mule ; one in mcs-ltn1(apel<10.4) cannot take 2 arg.
+                (or (and wl-on-mule
+                         ;; one in mcs-ltn1(apel<10.4) cannot take 2 arg.
                          (mime-charset-to-coding-system charset 'LF))
                     ;; Mule 2 doesn't have `*ctext*unix'.
                     (mime-charset-to-coding-system charset)))