This commit was manufactured by cvs2svn to create branch 'elmo-imap4-new-

[elisp/wanderlust.git] / elmo / elmo-map.el

diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el
index 129fde0..383124a 100644 (file)
--- a/elmo/elmo-map.el
+++ b/elmo/elmo-map.el
@@ -58,7 +58,7 @@
 
 
 (defmacro elmo-location-map-key (number)
-  `(concat "#" (int-to-string ,number)))
+  `(concat "#" (number-to-string ,number)))
 
 (defun elmo-location-map-load (location-map directory)
   (elmo-location-map-setup
@@ -208,10 +208,9 @@ Return new location alist."
                '<))
         (new-msgdb (elmo-make-msgdb (elmo-folder-msgdb-path folder)))
         (number 1)
-        total location entity)
-    (setq total (length numbers))
-    (elmo-with-progress-display (> total elmo-display-progress-threshold)
-       (elmo-folder-pack-numbers total "Packing...")
+        location entity)
+    (elmo-with-progress-display (elmo-folder-pack-numbers (length numbers))
+       "Packing"
       (dolist (old-number numbers)
        (setq entity (elmo-msgdb-message-entity msgdb old-number))
        (elmo-message-entity-set-number entity number)
@@ -228,7 +227,8 @@ Return new location alist."
     (elmo-folder-set-msgdb-internal folder new-msgdb)))
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-map-folder))
-  (elmo-location-map-load folder (elmo-folder-msgdb-path folder))
+  (unless (elmo-location-map-alist folder)
+    (elmo-location-map-load folder (elmo-folder-msgdb-path folder)))
   (when (elmo-folder-plugged-p folder)
     (elmo-location-map-update
      folder