From: hmurata <hmurata>
Date: Wed, 24 Oct 2001 12:59:34 +0000 (+0000)
Subject: * mmimap.el (mmimap-make-mime-entity): Fixed problem to be
X-Git-Tag: wl-2_7_6~12
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b77d1531e59f9f2a5eee6f3db38198ce6d1a7617;p=elisp%2Fwanderlust.git

* mmimap.el (mmimap-make-mime-entity): Fixed problem to be
assigned irregular node-id to nested multipart section.
(initialize-instance): Followed above change.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 75a0d09..83d9829 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* mmimap.el (mmimap-make-mime-entity): Fixed problem to be
+	assigned irregular node-id to nested multipart section.
+	(initialize-instance): Followed above change.
+
 2001-10-17  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo-shimbun.el (elmo-shimbun-get-headers): Don't call
diff --git a/elmo/mmimap.el b/elmo/mmimap.el
index bec308b..7199c4a 100644
--- a/elmo/mmimap.el
+++ b/elmo/mmimap.el
@@ -24,7 +24,7 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
-;; 
+;;
 
 ;;; Code:
 
@@ -56,7 +56,7 @@ SECTION is a section string which is defined in RFC2060.")
   "Return non-nil when LOCATION may fetch the ENTITY.")
 
 ;;; @ Subroutines
-;; 
+;;
 
 (defun mmimap-entity-section (node-id)
   "Return a section string from NODE-ID"
@@ -64,7 +64,7 @@ SECTION is a section string which is defined in RFC2060.")
    ((numberp node-id)
     (number-to-string (1+ node-id)))
    ((listp node-id)
-    (mapconcat 
+    (mapconcat
      'mmimap-entity-section
      (reverse node-id)
      "."))))
@@ -83,6 +83,7 @@ SECTION is a section string which is defined in RFC2060.")
 					      parent)
   "Analyze parsed IMAP4 BODYSTRUCTURE response and make MIME entity.
 CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
+  (setq node-id (if number (cons number node-id) node-id))
   (cond
    ((listp (car bodystructure)) ; multipart
     (let ((num 0)
@@ -93,9 +94,7 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
 	     :new      t
 	     :parent   parent
 	     :location location
-	     :node-id (if (eq number 0)
-			  node-id
-			(nconc (list number) node-id))))
+	     :node-id  node-id))
       (while (and (setq curp (car bodystructure))
 		  (listp curp))
 	(setq children
@@ -103,9 +102,7 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
 		     (list
 		      (mmimap-make-mime-entity curp class
 					       location
-					       (if (eq number 0)
-						   node-id
-						 (nconc (list number) node-id))
+					       node-id
 					       num
 					       entity))))
 	(setq num (+ num 1))
@@ -122,7 +119,6 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
       entity))
    (t ; singlepart
     (let (content-type entity)
-      (setq node-id (nconc (list number) node-id))
       (setq entity
 	    (luna-make-entity
 	     class
@@ -139,7 +135,7 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
 				   (intern (downcase
 					    (nth 1 bodystructure))))
 			       (mime-decode-parameters
-				(nth 2 bodystructure))))      
+				(nth 2 bodystructure))))
       (mime-entity-set-encoding-internal entity
 					 (and (nth 5 bodystructure)
 					      (downcase
@@ -160,11 +156,11 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
   (if (mime-imap-entity-new-internal entity)
       entity
     (mmimap-make-mime-entity
-     (mime-imap-location-bodystructure 
+     (mime-imap-location-bodystructure
       (mime-entity-location-internal entity))
      (luna-class-name entity)
      (mime-entity-location-internal entity)
-     nil 0 nil)))
+     nil nil nil)))
 
 ;;; @ entity
 ;;
@@ -254,7 +250,7 @@ CLASS, LOCATION, NODE-ID, PARENT are set to the returned entity."
 
 (luna-define-method mime-entity-fetch-field :around
   ((entity mime-imap-entity) field-name)
-  (if (mime-root-entity-p entity) 
+  (if (mime-root-entity-p entity)
       (or (luna-call-next-method)
 	  (with-temp-buffer
 	    (insert (mime-imap-entity-header-string entity))