From: teranisi <teranisi>
Date: Mon, 6 Oct 2003 15:05:12 +0000 (+0000)
Subject: * modb-legacy.el (elmo-msgdb-message-entity): Return nil when key is nil.
X-Git-Tag: wl-2_11_19~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=439c499e9d2c942563c1706ab9b3ae12e538bdd6;p=elisp%2Fwanderlust.git

* modb-legacy.el (elmo-msgdb-message-entity): Return nil when key is nil.
* modb-standard.el (elmo-msgdb-message-entity): Ditto.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 92c7382..66ce27c 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,9 @@
 2003-10-06  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* modb-legacy.el (elmo-msgdb-message-entity): Return nil when key
+	is nil.
+	* modb-standard.el (elmo-msgdb-message-entity): Ditto.
+
 	* elmo-imap4.el (elmo-imap4-session): Added new slot `flags'.
 	(elmo-imap4-session-select-mailbox): Set it according to the SELECT
 	response.
diff --git a/elmo/modb-legacy.el b/elmo/modb-legacy.el
index d8e255d..49919ab 100644
--- a/elmo/modb-legacy.el
+++ b/elmo/modb-legacy.el
@@ -560,10 +560,11 @@ Return a list of message numbers which have duplicated message-ids."
     msgdb))
 
 (luna-define-method elmo-msgdb-message-entity ((msgdb modb-legacy) key)
-  (elmo-get-hash-val
-   (cond ((stringp key) key)
-	 ((numberp key) (format "#%d" key)))
-   (elmo-msgdb-get-entity-hashtb msgdb)))
+  (when key
+    (elmo-get-hash-val
+     (cond ((stringp key) key)
+	   ((numberp key) (format "#%d" key)))
+     (elmo-msgdb-get-entity-hashtb msgdb))))
 
 (require 'product)
 (product-provide (provide 'modb-legacy) (require 'elmo-version))
diff --git a/elmo/modb-standard.el b/elmo/modb-standard.el
index 7ef477a..02ab400 100644
--- a/elmo/modb-standard.el
+++ b/elmo/modb-standard.el
@@ -492,10 +492,11 @@
     msgdb))
 
 (luna-define-method elmo-msgdb-message-entity ((msgdb modb-standard) key)
-  (let ((ret (elmo-get-hash-val
-	      (cond ((stringp key) key)
-		    ((numberp key) (modb-standard-key key)))
-	      (modb-standard-entity-map-internal msgdb))))
+  (let ((ret (and key
+		  (elmo-get-hash-val
+		   (cond ((stringp key) key)
+			 ((numberp key) (modb-standard-key key)))
+		   (modb-standard-entity-map-internal msgdb)))))
     (if (eq 'autoload (car-safe ret))
 	(when modb-standard-divide-number
 	  (modb-standard-load-entity