From 3c4531eeff7bf31011fd685fadf9c502aefa93ca Mon Sep 17 00:00:00 2001 From: morioka Date: Sat, 14 Mar 1998 12:20:11 +0000 Subject: [PATCH] Rename `reversed-entity-number' -> `entity-node-id'. --- mime-pgp.el | 20 ++++++++++---------- mime-view.el | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mime-pgp.el b/mime-pgp.el index 0ff9edb..1949119 100644 --- a/mime-pgp.el +++ b/mime-pgp.el @@ -121,8 +121,8 @@ "Internal method to verify multipart/signed." (mime-raw-play-entity ;; entity-info of signature - (mime-raw-reversed-entity-number-to-entity-info - ;; reversed-entity-number of signature + (mime-raw-entity-node-id-to-entity-info + ;; entity-node-id of signature (cons 1 (reverse (mime-raw-point-to-entity-number start))) mime-raw-message-info) (cdr (assq 'mode cal)) ; play-mode @@ -178,14 +178,14 @@ It should be ISO 639 2 letter language code such as en, ja, ...") "Internal method to check PGP/MIME signature." (let* ((encoding (cdr (assq 'encoding cal))) (entity-number (mime-raw-point-to-entity-number start)) - (reversed-entity-number (reverse entity-number)) - (rmcnum (cdr reversed-entity-number)) - (knum (car reversed-entity-number)) + (entity-node-id (reverse entity-number)) + (rmcnum (cdr entity-node-id)) + (knum (car entity-node-id)) (onum (if (> knum 0) (1- knum) (1+ knum))) (raw-buf (current-buffer)) - (oinfo (mime-raw-reversed-entity-number-to-entity-info + (oinfo (mime-raw-entity-node-id-to-entity-info (cons onum rmcnum) mime-raw-message-info)) kbuf (basename (expand-file-name "tm" mime-temp-directory)) @@ -263,13 +263,13 @@ It should be ISO 639 2 letter language code such as en, ja, ...") (defun mime-method-to-decrypt-application/pgp-encrypted (start end cal) (let* ((entity-number (mime-raw-point-to-entity-number start)) - (reversed-entity-number (reverse entity-number)) - (rmcnum (cdr reversed-entity-number)) - (knum (car reversed-entity-number)) + (entity-node-id (reverse entity-number)) + (rmcnum (cdr entity-node-id)) + (knum (car entity-node-id)) (onum (if (> knum 0) (1- knum) (1+ knum))) - (oinfo (mime-raw-reversed-entity-number-to-entity-info + (oinfo (mime-raw-entity-node-id-to-entity-info (cons onum rmcnum) mime-raw-message-info)) (obeg (mime-entity-info-point-min oinfo)) (oend (mime-entity-info-point-max oinfo)) diff --git a/mime-view.el b/mime-view.el index 04a8f1f..f90afe8 100644 --- a/mime-view.el +++ b/mime-view.el @@ -218,7 +218,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 ((entity-info - (mime-raw-reversed-entity-number-to-entity-info + (mime-raw-entity-node-id-to-entity-info (cdr rcnum) cinfo))) (and (eq (mime-entity-info-media-type entity-info) 'multipart) @@ -602,9 +602,9 @@ If optional argument MESSAGE-INFO is not specified, ))) t)))) -(defsubst mime-raw-reversed-entity-number-to-entity-info - (entity-number &optional message-info) - "Return entity-info from REVERSED-ENTITY-NUMBER in mime-raw-buffer. +(defsubst mime-raw-entity-node-id-to-entity-info (entity-number + &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." (mime-raw-entity-number-to-entity-info (reverse entity-number) message-info)) @@ -648,7 +648,7 @@ If optional argument MESSAGE-INFO is not specified, "Return non-nil if header of current entity is visible." (or (null rcnum) (member (mime-entity-info-type/subtype - (mime-raw-reversed-entity-number-to-entity-info + (mime-raw-entity-node-id-to-entity-info (cdr rcnum) cinfo)) mime-view-childrens-header-showing-Content-Type-list) )) @@ -663,7 +663,7 @@ If optional argument MESSAGE-INFO is not specified, (if (and (eq media-type 'application) (eq media-subtype 'octet-stream)) (let ((ccinfo - (mime-raw-reversed-entity-number-to-entity-info + (mime-raw-entity-node-id-to-entity-info rcnum cinfo))) (member (mime-entity-info-encoding ccinfo) '(nil "7bit" "8bit")) @@ -977,7 +977,7 @@ It calls following-method selected from variable (set-buffer a-buf) (setq ci - (mime-raw-reversed-entity-number-to-entity-info + (mime-raw-entity-node-id-to-entity-info rcnum)) (save-restriction (narrow-to-region @@ -1054,7 +1054,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-reversed-entity-number-to-entity-info + (let ((r (mime-raw-entity-node-id-to-entity-info (cdr (mime-entity-info-node-id cinfo)) (get-text-property 1 'mime-view-entity-info))) point) -- 1.7.10.4