X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-view.el;h=8c7fb6dbe799b91505840da2ee180104cb4ae0bc;hb=c0e430ceaa37ffb494bf69204fa5936a2434015d;hp=f4a9fa6ddf1d34dd01c33e96802bee9a85e24813;hpb=a6c18e6c4cc5c2eb55bfc8164ee251d8798ddad7;p=elisp%2Fsemi.git

diff --git a/mime-view.el b/mime-view.el
index f4a9fa6..8c7fb6d 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -189,18 +189,6 @@ If optional argument MESSAGE-INFO is not specified,
 	    (setq children (cdr children)))
 	  message-info))))
 
-(defsubst mime-raw-point-to-entity-node-id (point &optional message-info)
-  "Return entity-node-id from POINT in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (mime-entity-node-id (mime-raw-find-entity-from-point point message-info)))
-
-(defsubst mime-raw-point-to-entity-number (point &optional message-info)
-  "Return entity-number from POINT in mime-raw-buffer.
-If optional argument MESSAGE-INFO is not specified,
-`mime-raw-message-info' is used."
-  (reverse (mime-raw-point-to-entity-node-id point message-info)))
-
 (defsubst mime-entity-parent (entity &optional message-info)
   "Return mother entity of ENTITY.
 If optional argument MESSAGE-INFO is not specified,
@@ -212,6 +200,18 @@ If optional argument MESSAGE-INFO is not specified,
 	 (set-buffer (mime-entity-buffer entity))
 	 mime-raw-message-info))))
 
+(defsubst mime-raw-point-to-entity-node-id (point &optional message-info)
+  "Return entity-node-id from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (mime-entity-node-id (mime-raw-find-entity-from-point point message-info)))
+
+(defsubst mime-raw-point-to-entity-number (point &optional message-info)
+  "Return entity-number from POINT in mime-raw-buffer.
+If optional argument MESSAGE-INFO is not specified,
+`mime-raw-message-info' is used."
+  (mime-entity-number (mime-raw-find-entity-from-point point message-info)))
+
 (defun mime-raw-flatten-message-info (&optional message-info)
   "Return list of entity in mime-raw-buffer.
 If optional argument MESSAGE-INFO is not specified,
@@ -254,7 +254,7 @@ Please redefine this function if you want to change default setting."
 ;;; @@@ entity button generator
 ;;;
 
-(defun mime-view-insert-entity-button (entity message-info subj)
+(defun mime-view-insert-entity-button (entity subject)
   "Insert entity-button of ENTITY."
   (let ((entity-node-id (mime-entity-node-id entity))
 	(params (mime-entity-parameters entity)))
@@ -274,12 +274,12 @@ Please redefine this function if you want to change default setting."
 		(setq access-type (cdr access-type))
 		(if server
 		    (format "%s %s ([%s] %s)"
-			    num subj access-type (cdr server))
+			    num subject access-type (cdr server))
 		(let ((site (cdr (assoc "site" params)))
 		      (dir (cdr (assoc "directory" params)))
 		      )
 		  (format "%s %s ([%s] %s:%s)"
-			  num subj access-type site dir)
+			  num subject access-type site dir)
 		  )))
 	    )
 	   (t
@@ -288,7 +288,7 @@ Please redefine this function if you want to change default setting."
 		  (charset (cdr (assoc "charset" params)))
 		  (encoding (mime-entity-encoding entity)))
 	      (concat
-	       num " " subj
+	       num " " subject
 	       (let ((rest
 		      (format " <%s/%s%s%s>"
 			      media-type media-subtype
@@ -872,7 +872,7 @@ The compressed face will be piped to this command.")
       (narrow-to-region nb nb)
       (or button-is-invisible
 	  (if (mime-view-entity-button-visible-p entity)
-	      (mime-view-insert-entity-button entity message-info subj)
+	      (mime-view-insert-entity-button entity subj)
 	    ))
       (if header-is-visible
 	  (save-restriction
@@ -900,7 +900,7 @@ The compressed face will be piped to this command.")
 	    (t
 	     (when button-is-invisible
 	       (goto-char (point-max))
-	       (mime-view-insert-entity-button entity message-info subj)
+	       (mime-view-insert-entity-button entity subj)
 	       )
 	     (or header-is-visible
 		 (progn