From: morioka <morioka>
Date: Thu, 12 Mar 1998 19:53:08 +0000 (+0000)
Subject: Sync with main branch.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=146c1e0302257ded39e35785901815403c71c3e0;p=elisp%2Fsemi.git

Sync with main branch.
---

diff --git a/mime-pgp.el b/mime-pgp.el
index 021dcbb..146ac5c 100644
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -47,7 +47,7 @@
 ;;;
 ;;; It is based on draft-kazu-pgp-mime-00.txt
 
-(defun mime-process-application/pgp (beg end cal)
+(defun mime-method-for-application/pgp (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
 	 (p-win (or (get-buffer-window mime-view-buffer)
 		    (get-largest-window)))
@@ -104,19 +104,19 @@
 
 (set-atype 'mime-acting-condition
 	   '((type . "application/pgp")
-	     (method . mime-process-application/pgp)
+	     (method . mime-method-for-application/pgp)
 	     ))
 
 (set-atype 'mime-acting-condition
 	   '((type . "text/x-pgp")
-	     (method . mime-process-application/pgp)
+	     (method . mime-method-for-application/pgp)
 	     ))
 
 
 ;;; @ Internal method for multipart/signed
 ;;;
 
-(defun mime-check-multipart/signed (beg end cal)
+(defun mime-method-to-verify-multipart/signed (beg end cal)
   "Internal method to check multipart/signed."
   (let* ((rcnum (reverse (mime-article/point-content-number beg)))
 	 (oinfo (mime-article/rcnum-to-cinfo (cons '1 rcnum)
@@ -127,7 +127,7 @@
 
 (set-atype 'mime-acting-condition
 	   '((type . "multipart/signed")
-	     (method . mime-check-multipart/signed)
+	     (method . mime-method-to-verify-multipart/signed)
 	     ))
 
 
@@ -172,7 +172,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 		 (t "Bad signature")))
 	  ))))
 
-(defun mime-pgp-check-application/pgp-signature (beg end cal)
+(defun mime-method-to-verify-application/pgp-signature (beg end cal)
   "Internal method to check PGP/MIME signature."
   (let* ((encoding (cdr (assq 'encoding cal)))
 	 (cnum (mime-article/point-content-number beg))
@@ -252,7 +252,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 (set-atype 'mime-acting-condition
 	   '((type . "application/pgp-signature")
-	     (method . mime-pgp-check-application/pgp-signature)
+	     (method . mime-method-to-verify-application/pgp-signature)
 	     ))
 
 
@@ -260,7 +260,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;;
 ;;; It is based on RFC 2015.
 
-(defun mime-pgp-decrypt-application/pgp-encrypted (beg end cal)
+(defun mime-method-to-decrypt-application/pgp-encrypted (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
 	 (rcnum (reverse cnum))
 	 (rmcnum (cdr rcnum))
@@ -273,12 +273,12 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 	 (obeg (mime-entity-info-point-min oinfo))
 	 (oend (mime-entity-info-point-max oinfo))
 	 )
-    (mime-process-application/pgp obeg oend cal)
+    (mime-method-for-application/pgp obeg oend cal)
     ))
 
 (set-atype 'mime-acting-condition
 	   '((type . "application/pgp-encrypted")
-	     (method . mime-pgp-decrypt-application/pgp-encrypted)
+	     (method . mime-method-to-decrypt-application/pgp-encrypted)
 	     ))
 
 
@@ -286,7 +286,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;;
 ;;; It is based on RFC 2015.
 
-(defun mime-pgp-add-keys (beg end cal)
+(defun mime-method-to-add-application/pgp-keys (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
 	 (new-name (format "%s-%s" (buffer-name) cnum))
 	 (encoding (cdr (assq 'encoding cal)))
@@ -307,7 +307,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 (set-atype 'mime-acting-condition
 	   '((type . "application/pgp-keys")
-	     (method . mime-pgp-add-keys)
+	     (method . mime-method-to-add-application/pgp-keys)
 	     ))