From: yamaoka <yamaoka>
Date: Sun, 27 Oct 2002 23:30:40 +0000 (+0000)
Subject: Synch with the semi-1_14 branch.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e44fa13f91404a85d05d2bc179f94016dce3fb2b;p=elisp%2Fsemi.git

Synch with the semi-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index 4b502a4..68ac124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-26  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* mime-view.el (mime-preview-find-boundary-info): Fix logic. Do not
+	refer next to next part before examining the next part.
+
 2002-08-28  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* mime-edit.el (mime-edit-user-agent-value): Add
diff --git a/mime-view.el b/mime-view.el
index 3bedcad..7dca53f 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -1474,6 +1474,8 @@ button-2	Move to point under the mouse cursor
 ;;;
 
 (defun mime-preview-find-boundary-info (&optional get-mother)
+  "Return boundary information of current part.
+If GET-MOTHER, refer boundary surrounding current part and its branches."
   (let (entity
 	p-beg p-end
 	entity-node-id len)
@@ -1504,7 +1506,6 @@ button-2	Move to point under the mouse cursor
 	   )
 	  (get-mother
 	   (save-excursion
-	     (goto-char p-end)
 	     (catch 'tag
 	       (let (e i)
 		 (while (setq e
@@ -1512,12 +1513,14 @@ button-2	Move to point under the mouse cursor
 			       (point) 'mime-view-entity))
 		   (goto-char e)
 		   (let ((rc (mime-entity-node-id
-			      (get-text-property (1- (point))
+			      (get-text-property (point)
 						 'mime-view-entity))))
 		     (or (and (>= (setq i (- (length rc) len)) 0)
 			      (equal entity-node-id (nthcdr i rc)))
 			 (throw 'tag nil)))
-		   (setq p-end e)))
+		   (setq p-end (or (next-single-property-change
+				    (point) 'mime-view-entity)
+				   (point-max)))))
 	       (setq p-end (point-max))))
 	   ))
     (vector p-beg p-end entity)))