* elmo-archive.el (elmo-archive-list-folder-subr): Fix.

        (elmo-archive-list-folder): Fix.
        (elmo-archive-max-of-folder): Fix.
        * elmo-localdir.el (elmo-localdir-copy-msgs): Use
         `elmo-localdir-max-of-folder' instead of 'elmo-localdir-
list-folder-subr'.
        (elmo-localdir-append-msg): Ditto.
        (elmo-localdir-list-folder): Fix for `nonsort'.
        (elmo-localdir-list-folder-subr): Fix for `killed'.
        * elmo-maildir.el (elmo-maildir-list-folder): Ditto.
        (elmo-maildir-list-folder-subr): Ditto.
        * elmo-archive.el (elmo-archive-list-folder): Ditto.
        (elmo-archive-list-folder-subr): Ditto.
        * elmo-internal.el (elmo-internal-list-folder): Ditto.
        (elmo-internal-list-folder-subr): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ae57423..8ae8ec1 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,23 @@
+2000-09-15  Kenichi OKADA <okada@opaopa.org>
+
+       * elmo-archive.el (elmo-archive-list-folder-subr): Fix.
+       (elmo-archive-list-folder): Fix.
+       (elmo-archive-max-of-folder): Fix.
+
+2000-09-15  Kenichi OKADA <okada@opaopa.org>
+
+       * elmo-localdir.el (elmo-localdir-copy-msgs): Use
+        `elmo-localdir-max-of-folder' instead of 'elmo-localdir-list-folder-subr'.
+       (elmo-localdir-append-msg): Ditto.
+       (elmo-localdir-list-folder): Fix for `nonsort'.
+       (elmo-localdir-list-folder-subr): Fix for `killed'.
+       * elmo-maildir.el (elmo-maildir-list-folder): Ditto.
+       (elmo-maildir-list-folder-subr): Ditto.
+       * elmo-archive.el (elmo-archive-list-folder): Ditto.
+       (elmo-archive-list-folder-subr): Ditto.
+       * elmo-internal.el (elmo-internal-list-folder): Ditto.
+       (elmo-internal-list-folder-subr): Ditto.
+
 2000-09-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-imap4.el (elmo-imap4-parse-flag-list): Rewrite.

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 714f536..dab0504 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -231,10 +231,13 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Scan Folder
 
-(defsubst elmo-archive-list-folder-subr (file type prefix &optional nonsort)
+(defsubst elmo-archive-list-folder-subr (spec &optional nonsort)
   "*Returns list of number-file(int, not string) in archive FILE.
 TYPE specifies the archiver's symbol."
-  (let* ((method (elmo-archive-get-method type 'ls))
+  (let* ((type (nth 2 spec))
+        (prefix (nth 3 spec))
+         (file (elmo-archive-get-archive-name (nth 1 spec) type spec))
+        (method (elmo-archive-get-method type 'ls))
         (args (list file))
         (file-regexp (format (elmo-archive-get-regexp type)
                              (elmo-concat-path (regexp-quote prefix) "")))
@@ -274,16 +277,10 @@ TYPE specifies the archiver's symbol."
       numbers))))
 
 (defun elmo-archive-list-folder (spec)
-  (let* ((type (nth 2 spec))
-        (prefix (nth 3 spec))
-        (arc (elmo-archive-get-archive-name (nth 1 spec) type spec)))
-    (elmo-archive-list-folder-subr arc type prefix)))
+  (elmo-archive-list-folder-subr spec))
 
 (defun elmo-archive-max-of-folder (spec)
-  (let* ((type (nth 2 spec))
-        (prefix (nth 3 spec))
-         (arc (elmo-archive-get-archive-name (nth 1 spec) type spec)))
-    (elmo-archive-list-folder-subr arc type prefix t)))
+  (elmo-archive-list-folder-subr spec t))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;