Rename `mime-raw-entity-node-id-to-entity-info' ->

`mime-raw-find-entity-from-node-id'.

diff --git a/mime-pgp.el b/mime-pgp.el
index 3d3590a..ae3e2e6 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -121,7 +121,7 @@
   "Internal method to verify multipart/signed."
   (mime-raw-play-entity
    ;; entity-info of signature
-   (mime-raw-entity-node-id-to-entity-info
+   (mime-raw-find-entity-from-node-id
     ;; entity-node-id of signature
     (cons 1 (mime-raw-point-to-entity-node-id start)))
    (cdr (assq 'mode cal)) ; play-mode
@@ -183,7 +183,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (raw-buf (current-buffer))
-        (oinfo (mime-raw-entity-node-id-to-entity-info
+        (oinfo (mime-raw-find-entity-from-node-id
                 (cons onum mother-node-id) mime-raw-message-info))
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
@@ -247,7 +247,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (oinfo (mime-raw-entity-node-id-to-entity-info
+        (oinfo (mime-raw-find-entity-from-node-id
                 (cons onum mother-node-id) mime-raw-message-info))
         (obeg (mime-entity-point-min oinfo))
         (oend (mime-entity-point-max oinfo))

diff --git a/mime-view.el b/mime-view.el
index ca75591..e3064fe 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -51,8 +51,7 @@
 
 (defvar mime-raw-message-info
   "Information about structure of message.
-Please use reference function `mime-entity-SLOT' to get value of
-SLOT.
+Please use reference function `mime-entity-SLOT' to get value of SLOT.
 
 Following is a list of slots of the structure:
 
@@ -164,7 +163,7 @@ Please redefine this function if you want to change default setting."
             (or (eq media-subtype 'x-selection)
                 (and (eq media-subtype 'octet-stream)
                      (let ((mother-entity
-                            (mime-raw-entity-node-id-to-entity-info
+                            (mime-raw-find-entity-from-node-id
                              (cdr entity-node-id) message-info)))
                        (and (eq (mime-entity-media-type mother-entity)
                                 'multipart)
@@ -189,7 +188,7 @@ Please redefine this function if you want to change default setting."
   (let ((entity-node-id (mime-entity-node-id entity)))
     (or (null entity-node-id)
        (member (mime-entity-type/subtype
-                (mime-raw-entity-node-id-to-entity-info
+                (mime-raw-find-entity-from-node-id
                  (cdr entity-node-id) message-info))
                mime-view-childrens-header-showing-Content-Type-list)
        )))
@@ -650,8 +649,8 @@ If optional argument MESSAGE-INFO is not specified,
 `mime-raw-message-info' is used."
   (reverse (mime-raw-point-to-entity-number position message-info)))
 
-(defsubst mime-raw-entity-node-id-to-entity-info (entity-node-id
-                                                 &optional message-info)
+(defsubst mime-raw-find-entity-from-node-id (entity-node-id
+                                            &optional message-info)
   "Return entity-info from ENTITY-NODE-ID in mime-raw-buffer.
 If optional argument MESSAGE-INFO is not specified,
 `mime-raw-message-info' is used."
@@ -999,8 +998,7 @@ It calls following-method selected from variable
                        (set-buffer a-buf)
                        (setq
                         ci
-                        (mime-raw-entity-node-id-to-entity-info
-                         entity-node-id))
+                        (mime-raw-find-entity-from-node-id entity-node-id))
                        (save-restriction
                          (narrow-to-region
                           (mime-entity-point-min ci)
@@ -1076,7 +1074,7 @@ If there is no upper entity, call function `mime-preview-quit'."
                       (get-text-property (point) 'mime-view-entity-info)))
       (backward-char)
       )
-    (let ((r (mime-raw-entity-node-id-to-entity-info
+    (let ((r (mime-raw-find-entity-from-node-id
              (cdr (mime-entity-node-id cinfo))
              (get-text-property 1 'mime-view-entity-info)))
          point)