From: dmaus <dmaus>
Date: Sun, 24 Oct 2010 06:36:09 +0000 (+0000)
Subject: Explicitly define method `elmo-folder-open-internal-p' for POP3 and
X-Git-Tag: merged-trunk-to-elmo-imap4-compliance-2^2~14
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b411c26020b3dfcbb70ec1c330958774f07f8ea6;p=elisp%2Fwanderlust.git

Explicitly define method `elmo-folder-open-internal-p' for POP3 and
Shimbun folder class prevent calling this method of the first parent,
elmo-net-folder which falls back to the default behaviour, always
return t.

* elmo-pop3.el (elmo-folder-open-internal-p): Define method for this
class.
* elmo-shimbun.el (elmo-folder-open-internal-p): Dto.
* elmo-multi.el (elmo-folder-open-internal-p): Fix invalid let
statement.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 90353ee..b07d013 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-24  David Maus  <dmaus@ictsoc.de>
+
+	* elmo-pop3.el (elmo-folder-open-internal-p): Define method for
+	this class.
+	* elmo-shimbun.el (elmo-folder-open-internal-p): Dto.
+	* elmo-multi.el (elmo-folder-open-internal-p): Fix invalid let
+	statement.
+
 2010-10-14  David Maus  <dmaus@ictsoc.de>
 
 	* elmo-multi.el (elmo-folder-open-internal-p): Evaluate symbol to
diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index f3fd075..4f15a9d 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -125,7 +125,7 @@
       (elmo-folder-open-internal fld))))
 
 (luna-define-method elmo-folder-open-internal-p ((folder elmo-multi-folder))
-  (let (open t)
+  (let ((open t))
     (dolist (fld (elmo-multi-folder-children-internal folder) open)
       (setq open (and open (elmo-folder-open-internal-p fld))))))
 
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index aff5d75..2801637 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -789,6 +789,9 @@ until the login delay period has expired"))
   (when (elmo-pop3-folder-use-uidl folder)
     (elmo-location-map-load folder (elmo-folder-msgdb-path folder))))
 
+(luna-define-method elmo-folder-open-internal-p ((folder elmo-pop3-folder))
+  (elmo-location-map-alist folder))
+
 (luna-define-method elmo-folder-commit :after ((folder elmo-pop3-folder))
   (when (and (not elmo-inhibit-number-mapping)
 	     (elmo-folder-persistent-p folder))
diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index 889280a..f788b5f 100644
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -241,6 +241,9 @@ If it is the symbol `all', update overview for all shimbun folders."
 	 folder
 	 (elmo-map-folder-list-message-locations folder))))))
 
+(luna-define-method elmo-folder-open-internal-p ((folder elmo-shimbun-folder))
+  (elmo-location-map-alist folder))
+
 (luna-define-method elmo-folder-reserve-status-p ((folder elmo-shimbun-folder))
   t)