From: hmurata <hmurata>
Date: Sat, 5 Apr 2003 04:45:27 +0000 (+0000)
Subject: * elmo-msgdb.el (elmo-msgdb-message-entity-field): Don't use self
X-Git-Tag: elmo-mark-restart~63
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2297be5e17f5b0949d5332e5df74f24f5d65e681;p=elisp%2Fwanderlust.git

* elmo-msgdb.el (elmo-msgdb-message-entity-field): Don't use self
recursive call (can't byte compile on emacs 20.7).
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 300b089..0919f2c 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-05  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-msgdb.el (elmo-msgdb-message-entity-field): Don't use self
+	recursive call (can't byte compile on emacs 20.7).
+
 2003-04-02  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo.el (elmo-folder-list-messages): Redefine as a luna method.
diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 0a7e183..0e000d9 100644
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -978,19 +978,20 @@ Return CONDITION itself if no entity exists in msgdb."
 
 (defsubst elmo-msgdb-message-entity-field (entity field &optional decode)
   (and entity
-       (if (not decode)
-	   (case field
-	     (to (aref (cdr entity) 5))
-	     (cc (aref (cdr entity) 6))
-	     (date (aref (cdr entity) 4))
-	     (subject (aref (cdr entity) 3))
-	     (from (aref (cdr entity) 2))
-	     (message-id (car entity))
-	     (references (aref (cdr entity) 1))
-	     (size (aref (cdr entity) 7))
-	     (t (cdr (assoc (symbol-name field) (aref (cdr entity) 8)))))
-	 (elmo-msgdb-get-decoded-cache
-	  (elmo-msgdb-message-entity-field entity field)))))
+       (let ((field-value
+	      (case field
+		(to (aref (cdr entity) 5))
+		(cc (aref (cdr entity) 6))
+		(date (aref (cdr entity) 4))
+		(subject (aref (cdr entity) 3))
+		(from (aref (cdr entity) 2))
+		(message-id (car entity))
+		(references (aref (cdr entity) 1))
+		(size (aref (cdr entity) 7))
+		(t (cdr (assoc (symbol-name field) (aref (cdr entity) 8)))))))
+	 (if decode
+	     (elmo-msgdb-get-decoded-cache field-value)
+	   field-value))))
 
 (defsubst elmo-msgdb-message-entity-set-field (entity field value)
   (and entity