* wl-summary.el (wl-summary-buffer-message-redisplay-func): Removed.

* wl-vars.el (wl-cache-prefetch-get-next-func): Ditto.

* wl-draft.el (wl-caesar-region-func): Ditto.

* wl-summary.el (wl-summary-exec-subr): Fixed `copy';
 Keep unread status in elmo-folder-move-messages.
 (wl-summary-sync-update): Set `wl-summary-buffer-msgdb'.

* elmo.el (elmo-folder-have-subfolder-p): New generic function.

* elmo-mark.el (elmo-folder-have-subfolder-p): Define.

* elmo-internal.el (elmo-folder-list-subfolders): Rewrite.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ddb5add..d6d3b40 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-folder-have-subfolder-p): New generic function.
+
+       * elmo-mark.el (elmo-folder-have-subfolder-p): Define.
+
+       * elmo-internal.el (elmo-folder-list-subfolders): Rewrite.
+
 2001-02-27  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-maildir.el (elmo-folder-msgdb-create): Fixed.

diff --git a/elmo/elmo-internal.el b/elmo/elmo-internal.el
index 9db3b9a..75415fb 100644 (file)
--- a/elmo/elmo-internal.el
+++ b/elmo/elmo-internal.el
@@ -66,8 +66,14 @@
                                                 &optional one-level)
   (mapcar
    (lambda (x)
-     (list (concat (elmo-folder-prefix-internal folder)
+     (if (elmo-folder-have-subfolder-p
+         (elmo-make-folder
+          (concat (elmo-folder-prefix-internal folder)
                   (symbol-name x))))
+        (list (concat (elmo-folder-prefix-internal folder)
+                      (symbol-name x)))
+       (concat (elmo-folder-prefix-internal folder)
+              (symbol-name x))))
    elmo-internal-folder-list))
 
 (require 'product)

diff --git a/elmo/elmo-mark.el b/elmo/elmo-mark.el
index eef8c3f..03bf8d3 100644 (file)
--- a/elmo/elmo-mark.el
+++ b/elmo/elmo-mark.el
@@ -49,6 +49,9 @@
    elmo-mark-default-mark)
   folder)
 
+(luna-define-method elmo-folder-have-subfolder-p ((folder elmo-mark-folder))
+  nil)
+
 (luna-define-method elmo-folder-expand-msgdb-path ((folder
                                                    elmo-mark-folder))
   (expand-file-name "mark"

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 6b2e543..3ac0cee 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -248,6 +248,9 @@ If optional argument ONE-LEVEL is non-nil, only children of FOLDER is returned.
 (a folder which have children is returned as a list)
 Otherwise, all descendent folders are returned.")
 
+(luna-define-generic elmo-folder-have-subfolder-p (folder)
+  "Return non-nil when FOLDER has subfolders.")
+
 (luna-define-generic elmo-folder-exists-p (folder)
   "Returns non-nil when FOLDER exists.")
 
@@ -630,6 +633,9 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
 (luna-define-method elmo-folder-local-p ((folder elmo-folder))
   t)   ; default is local.
 
+(luna-define-method elmo-folder-have-subfolder-p ((folder elmo-folder))
+  t)
+
 ;;; Folder info
 ;; Folder info is a message number information cache (hashtable)
 (defsubst elmo-folder-get-info (folder &optional hashtb)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 228a2e8..b6ff05b 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,15 @@
+2001-02-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-buffer-message-redisplay-func): Removed.
+
+       * wl-vars.el (wl-cache-prefetch-get-next-func): Ditto.
+
+       * wl-draft.el (wl-caesar-region-func): Ditto.
+
+       * wl-summary.el (wl-summary-exec-subr): Fixed `copy';
+       Keep unread status in elmo-folder-move-messages.
+       (wl-summary-sync-update): Set `wl-summary-buffer-msgdb'.
+
 2001-02-27  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-summary.el (wl-summary-buffer-exit-function): Renamed from

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 2fac793..ed7035b 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -50,7 +50,6 @@
   (defalias-maybe 'wl-draft-mode 'ignore))
 
 (defvar wl-draft-buf-name "Draft")
-(defvar wl-caesar-region-func nil)
 (defvar wl-draft-cite-function 'wl-default-draft-cite)
 (defvar wl-draft-buffer-file-name nil)
 (defvar wl-draft-field-completion-list nil)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index cb1164e..a610f4a 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -89,7 +89,6 @@
 (defvar wl-summary-buffer-mime-charset  nil)
 (defvar wl-summary-buffer-weekday-name-lang  nil)
 (defvar wl-summary-buffer-thread-indent-set-alist  nil)
-(defvar wl-summary-buffer-message-redisplay-func nil)
 (defvar wl-summary-buffer-view 'thread)
 (defvar wl-summary-buffer-message-modified nil)
 (defvar wl-summary-buffer-mark-modified nil)
@@ -2206,6 +2205,7 @@ If ARG is non-nil, checking is omitted."
                                wl-summary-partial-highlight-above-lines
                                wl-summary-highlight-partial-threshold)))
              (wl-highlight-summary (point) (point-max))))))
+    (setq wl-summary-buffer-msgdb (elmo-folder-msgdb folder))
     (wl-delete-all-overlays)
     (set-buffer-modified-p nil)
     (if mes (message "%s" mes))))
@@ -3159,7 +3159,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
                            (not (null (cdr dst-msgs)))
                            nil ; no-delete
                            nil ; same-number
-                           unread-marks))
+                           unread-marks
+                           t))
            (error nil))
          (if result                    ; succeeded.
              (progn
@@ -3180,16 +3181,18 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
          (setq result nil)
          (condition-case nil
              (setq result (elmo-folder-move-messages
-                           (wl-summary-buffer-folder-name)
+                           wl-summary-buffer-elmo-folder
                            (cdr (car dst-msgs))
-                           (car (car dst-msgs))
+                           (wl-folder-get-elmo-folder
+                            (car (car dst-msgs)))
                            (wl-summary-buffer-msgdb)
                            copy-len
                            copy-executed
                            (not (null (cdr dst-msgs)))
                            t ; t is no-delete (copy)
                            nil ; same number
-                           unread-marks))
+                           unread-marks
+                           t))
            (error nil))
          (if result                    ; succeeded.
              (progn

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 75c189e..db2b110 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1525,16 +1525,6 @@ e.x.
   :type '(repeat (regexp :tag "Folder Regexp"))
   :group 'wl-pref)
 
-(defcustom wl-cache-prefetch-get-next-func 'wl-summary-default-get-next-msg
-  "*A function to get message number when prefetch next message."
-  :type 'function
-  :group 'wl-pref)
-
-;; obsolete
-;(defvar wl-no-cache-folder-list '("^\\$.*")
-;  "All folders that match this list won't be cached when reading messages.
-;Each elements are regexp of folder name.")
-
 (defcustom wl-summary-always-sticky-folder-list nil
   "All folders that match this list has sticky summary.
 Each elements are regexp of folder name."