2001-05-08 Kenichi OKADA <okada@opaopa.org>

	* wl-folder.el (wl-folder-prefetch-entity): Use
	`wl-folder-get-elmo-folder'.
	(wl-folder-count-incorporates): Do not use
	`wl-folder-get-elmo-folder'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0a76bff..338fe96 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2001-05-08  Kenichi OKADA  <okada@opaopa.org>
 
+       * wl-folder.el (wl-folder-prefetch-entity): Use
+       `wl-folder-get-elmo-folder'.
+       (wl-folder-count-incorporates): Do not use
+       `wl-folder-get-elmo-folder'.
+
+2001-05-08  Kenichi OKADA  <okada@opaopa.org>
+
        * wl-xmas.el (wl-plugged-set-folder-icon): Use `elmo-folder-type'
        instead of `elmo-folder-get-type'.
 

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 77cf3b7..4105a33 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -2613,16 +2613,17 @@ Use `wl-subscribed-mailing-list'."
               (wl-folder-get-petname (car entity)))
       (cons sum-done sum-all)))
    ((stringp entity)
-    (let ((nums (wl-folder-get-entity-info entity))
-         (wl-summary-highlight (if (or (wl-summary-sticky-p entity)
-                                       (wl-summary-always-sticky-folder-p
-                                        entity))
-                                   wl-summary-highlight))
-         wl-summary-exit-next-move
-         wl-auto-select-first ret-val
-         count)
+    (let* ((folder (wl-folder-get-elmo-folder entity))
+          (nums (wl-folder-get-entity-info entity))
+          (wl-summary-highlight (if (or (wl-summary-sticky-p folder)
+                                        (wl-summary-always-sticky-folder-p
+                                         folder))
+                                    wl-summary-highlight))
+          wl-summary-exit-next-move
+          wl-auto-select-first ret-val
+          count)
       (setq count (or (car nums) 0))
-      (setq count (+ count (wl-folder-count-incorporates entity)))
+      (setq count (+ count (wl-folder-count-incorporates folder)))
       (if (or (null (car nums)) ; unknown
              (< 0 count))
          (save-window-excursion
@@ -2632,7 +2633,7 @@ Use `wl-subscribed-mailing-list'."
                                             (symbol-name this-command))))
                (wl-summary-goto-folder-subr entity
                                             (wl-summary-get-sync-range
-                                             (wl-folder-get-elmo-folder entity))
+                                             folder)
                                             nil)
                (setq ret-val (wl-summary-incorporate))
                (wl-summary-exit)
@@ -2641,8 +2642,7 @@ Use `wl-subscribed-mailing-list'."
 
 (defun wl-folder-count-incorporates (folder)
   (let ((marks (elmo-msgdb-mark-load
-               (elmo-folder-msgdb-path
-                (wl-folder-get-elmo-folder folder))))
+               (elmo-folder-msgdb-path folder)))
        (sum 0))
     (while marks
       (if (member (cadr (car marks))