* wl-e21.el (wl-summary-toolbar): Follow the rename of

wl-summary-delete.
* wl-xmas.el (wl-summary-toolbar): Ditto.

* wl-action.el (wl-summary-set-mark): Don't override current
temp-mark.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3b2cd68..4947b9c 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2003-07-19  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
+       * wl-e21.el (wl-summary-toolbar): Follow the rename of
+       wl-summary-delete.
+       * wl-xmas.el (wl-summary-toolbar): Ditto.
+
+       * wl-action.el (wl-summary-set-mark): Don't override current
+       temp-mark.
+
        * wl-refile.el (wl-refile-get-field-value): Fixed and simplified.
 
 2003-07-19  Yuuichi Teranishi  <teranisi@gohome.org>

diff --git a/wl/wl-action.el b/wl/wl-action.el
index 5174481..1aebd69 100644 (file)
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -66,30 +66,32 @@ Return number if put mark succeed"
                     (and number (wl-summary-jump-to-msg number))
                     ;; interactive
                     (and (null number) current))
-           number (or number current))
-      (when (and interactive
-                (null data)
-                (wl-summary-action-argument-function action))
-       (setq data (funcall (wl-summary-action-argument-function action)
-                           (wl-summary-action-symbol action)
-                           number)))
-      (when (setq cur-mark (nth 1 (wl-summary-registered-temp-mark number)))
-       (when (and (wl-summary-reserve-temp-mark-p cur-mark)
-                  interactive)
-         (error "Already marked as `%s'" cur-mark)))
-      (wl-summary-unset-mark number)
-      (when visible
-       (wl-summary-mark-line set-mark)
-       (when wl-summary-highlight
-         (wl-highlight-summary-current-line))
-       (when data
-         (wl-summary-print-destination number data)))
-      ;; Set action.
-      (funcall (wl-summary-action-set-function action)
-              number
-              (wl-summary-action-mark action)
-              data)
-      (set-buffer-modified-p nil))
+           number (or number current)
+           cur-mark (nth 1 (wl-summary-registered-temp-mark number)))
+      (if (and cur-mark
+              (wl-summary-reserve-temp-mark-p cur-mark))
+         (if interactive
+             (error "Already marked as `%s'" cur-mark)
+           (setq number nil))
+       (when (and interactive
+                  (null data)
+                  (wl-summary-action-argument-function action))
+         (setq data (funcall (wl-summary-action-argument-function action)
+                             (wl-summary-action-symbol action)
+                             number)))
+       (wl-summary-unset-mark number)
+       (when visible
+         (wl-summary-mark-line set-mark)
+         (when wl-summary-highlight
+           (wl-highlight-summary-current-line))
+         (when data
+           (wl-summary-print-destination number data)))
+       ;; Set action.
+       (funcall (wl-summary-action-set-function action)
+                number
+                (wl-summary-action-mark action)
+                data)
+       (set-buffer-modified-p nil)))
     ;; Move the cursor.
     (if (or interactive (interactive-p))
        (if (eq wl-summary-move-direction-downward nil)

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 591cce3..3bdd11a 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -120,8 +120,8 @@
      wl-summary-jump-to-current-message t "Jump to Current Message"]
     [wl-summary-sync-force-update
      wl-summary-sync-force-update t "Sync Current Folder"]
-    [wl-summary-delete
-     wl-summary-delete t "Delete Current Message"]
+    [wl-summary-dispose
+     wl-summary-dispose t "Dispose Current Message"]
     [wl-summary-mark-as-important
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 652184f..b0bd02c 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -90,8 +90,8 @@
      wl-summary-jump-to-current-message t "Jump to Current Message"]
     [wl-summary-sync-force-update
      wl-summary-sync-force-update t "Sync Current Folder"]
-    [wl-summary-delete
-     wl-summary-delete t "Delete Current Message"]
+    [wl-summary-dispose
+     wl-summary-dispose t "Dispose Current Message"]
     [wl-summary-mark-as-important
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft