* wl-summary.el (wl-summary-target-mark-reply-with-citation): Fixed.

 Delete other windows to avoid an error.
 Use `point-marker' instead of `point' to remember the start point of body.

* wl.el (wl-plugged-toggle-all): Fixed argument for `elmo-set-plugged'.

* wl-folder.el (wl-folder-check-one-entity): Adjust unread message
 number not to exceed all message number.

* elmo.el (elmo-folder-synchronize): Fixed problem when there's no new message.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9f7ec8b..e7e1ace 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-folder-synchronize): Fixed problem when there's no
+       new message.
+
 2001-04-12  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-util.el (elmo-file-cache-save): Ignore errors.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 78bacdb..f50223d 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1146,9 +1146,9 @@ CROSSED is cross-posted message number."
              ;; Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).
              (elmo-folder-process-crosspost folder)
              (elmo-folder-set-message-modified-internal folder t)
-             (elmo-folder-set-mark-modified-internal folder t)
-             ;; return value.
-             (list new-msgdb delete-list crossed))))
+             (elmo-folder-set-mark-modified-internal folder t))
+           ;; return value.
+           (list new-msgdb delete-list crossed)))
       (quit
        ;; Resume to the original status.
        (if before-append

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a815965..b391128 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,15 @@
+2001-04-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-target-mark-reply-with-citation): Fixed.
+       Delete other windows to avoid an error.
+       Use `point-marker' instead of `point' to remember the start point
+       of body.
+
+       * wl.el (wl-plugged-toggle-all): Fixed argument for `elmo-set-plugged'.
+
+       * wl-folder.el (wl-folder-check-one-entity): Adjust unread message
+       number not to exceed all message number.
+
 2001-04-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * wl-e21.el (wl-biff-init-icons): Don't use `call-interactively' to

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 42035b1..5278c98 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -829,21 +829,18 @@ Optional argument ARG is repeart count."
        (setq unsync (if (and (car nums) (> 0 (car nums))) 0 (car nums)))
        (setq nomif (if (and (car nums) (> 0 (cdr nums))) 0 (cdr nums)))
        (setq nums (cons unsync nomif)))
+      (setq unread (or ;; If server diff, All unreads are
+                       ; treated as unsync.
+                   (if (elmo-folder-use-flag-p folder)
+                       0)
+                   (elmo-folder-get-info-unread folder)
+                   (wl-summary-count-unread (elmo-msgdb-mark-load
+                                             (elmo-folder-msgdb-path
+                                              folder)))))
+      (setq unread (max unread (cdr nums)))
       (wl-folder-entity-hashtb-set wl-folder-entity-hashtb entity
                                   (list (car nums)
-                                        (setq
-                                         unread
-                                         (or
-                                          ;; If server diff, All unreads are
-                                          ;; treated as unsync.
-                                          (if (elmo-folder-use-flag-p folder)
-                                              0)
-                                          (elmo-folder-get-info-unread
-                                           folder)
-                                          (wl-summary-count-unread
-                                           (elmo-msgdb-mark-load
-                                            (elmo-folder-msgdb-path
-                                             folder)))))
+                                        unread
                                         (cdr nums))
                                   (get-buffer wl-folder-buffer-name)))
     (setq wl-folder-info-alist-modified t)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 0b1cd6b..ad0dcbf 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4610,11 +4610,12 @@ Return t if message exists."
     (wl-summary-jump-to-msg (car mlist))
     (wl-summary-reply arg t)
     (goto-char (point-max))
-    (setq start-point (point))
+    (setq start-point (point-marker))
     (setq draft-buf (current-buffer))
     (save-window-excursion
       (while mlist
        (set-buffer summary-buf)
+       (delete-other-windows)
        (wl-summary-jump-to-msg (car mlist))
        (wl-summary-redisplay)
        (set-buffer draft-buf)

diff --git a/wl/wl.el b/wl/wl.el
index a0ac37e..fbccd34 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -535,7 +535,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   (interactive)
   (let ((cur-point (point)))
     (setq wl-plugged-switch (not wl-plugged-switch))
-    (elmo-set-plugged wl-plugged-switch nil nil nil wl-plugged-alist)
+    (elmo-set-plugged wl-plugged-switch nil nil nil nil wl-plugged-alist)
     (wl-plugged-redrawing wl-plugged-alist)
     (goto-char cur-point)
     (setq wl-plugged-alist-modified t)