* wl-summary.el (wl-summary-sync-update): Bind elmo-folder-update-threshold.

(wl-summary-mark-as-important): Enclosed server mark processing
with `save-match-data'.

* wl-mime.el (wl-mime-setup): Set mime-setup-signature-key-alist
only when it is already defined.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 2dfc552..ee9b6aa 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-sync-update): Bind
+       elmo-folder-update-threshold.
+       (wl-summary-mark-as-important): Enclosed server mark processing
+       with `save-match-data'.
+
+       * wl-mime.el (wl-mime-setup): Set mime-setup-signature-key-alist
+       only when it is already defined.
+
 2001-05-24  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
 
        * wl-expire.el (wl-expire-archive-get-folder): Fixed problem that

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 0702c11..aac9672 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -334,10 +334,11 @@ By setting following-method as yank-content."
             'wl-original-message-mode
             (function elmo-mime-insert-header))
   ;; To avoid overriding wl-draft-mode-map.
-  (unless (assq 'wl-draft-mode mime-setup-signature-key-alist)
-    (setq mime-setup-signature-key-alist
-         (cons '(wl-draft-mode . "\C-c\C-w")
-               mime-setup-signature-key-alist)))
+  (when (boundp 'mime-setup-signature-key-alist)
+    (unless (assq 'wl-draft-mode mime-setup-signature-key-alist)
+      (setq mime-setup-signature-key-alist
+           (cons '(wl-draft-mode . "\C-c\C-w")
+                 mime-setup-signature-key-alist))))
   (add-hook 'elmo-message-text-content-inserted-hook 'wl-highlight-body-all)
   (add-hook 'elmo-message-header-inserted-hook 'wl-highlight-headers))
 

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 0be6d00..094b57c 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2024,6 +2024,7 @@ If ARG is non-nil, checking is omitted."
         (elmo-mime-charset wl-summary-buffer-mime-charset)
         (inhibit-read-only t)
         (buffer-read-only nil)
+        (elmo-folder-update-threshold wl-summary-update-confirm-threshold)
         gc-message
         overview number-alist mark-alist 
         curp num i new-msgdb
@@ -4102,11 +4103,11 @@ If ARG, exit virtual folder."
            (if (string= mark wl-summary-important-mark)
                (progn
                  ;; server side mark
-                 (unless no-server-update
-                   (elmo-folder-unmark-important folder (list number))
-                   (elmo-msgdb-global-mark-delete message-id))
-                 ;; Remove cache if local folder.
                  (save-match-data
+                   (unless no-server-update
+                     (elmo-folder-unmark-important folder (list number))
+                     (elmo-msgdb-global-mark-delete message-id))
+                   ;; Remove cache if local folder.
                    (if (and (elmo-folder-local-p folder)
                             (not (eq 'mark
                                      (elmo-folder-type-internal folder))))
@@ -4120,8 +4121,9 @@ If ARG, exit virtual folder."
                                             number
                                             nil)))
              ;; server side mark
-             (unless no-server-update
-               (elmo-folder-mark-as-important folder (list number)))
+             (save-match-data
+               (unless no-server-update
+                 (elmo-folder-mark-as-important folder (list number))))
              (when visible
                (delete-region (match-beginning 2) (match-end 2))
                (insert wl-summary-important-mark))