From: dmaus <dmaus>
Date: Tue, 2 Nov 2010 18:42:46 +0000 (+0000)
Subject: * elmo-pop3.el (elmo-folder-open-internal): Don't load location map if
X-Git-Tag: merged-trunk-to-elmo-imap4-compliance-2^2~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dd56a61bf042c67801157ffeee923e18f9656003;p=elisp%2Fwanderlust.git

* elmo-pop3.el (elmo-folder-open-internal): Don't load location map if
it is already loaded.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 7e9af8a..165dad9 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-02  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
+
+	* elmo-pop3.el (elmo-folder-open-internal): Don't load location
+	map if it is already loaded.
+
 2010-10-31  David Maus  <dmaus@ictsoc.de>
 
 	* elmo-map.el (elmo-folder-open-internal): Don't load location map
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index aff5d75..07555c6 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -786,8 +786,9 @@ until the login delay period has expired"))
       t)))
 
 (luna-define-method elmo-folder-open-internal ((folder elmo-pop3-folder))
-  (when (elmo-pop3-folder-use-uidl folder)
-    (elmo-location-map-load folder (elmo-folder-msgdb-path folder))))
+  (unless (elmo-location-map-alist folder)
+    (when (elmo-pop3-folder-use-uidl folder)
+      (elmo-location-map-load folder (elmo-folder-msgdb-path folder)))))
 
 (luna-define-method elmo-folder-commit :after ((folder elmo-pop3-folder))
   (when (and (not elmo-inhibit-number-mapping)