Move definition of variable `mime-raw-representation-type' from

[elisp/semi.git] / mime-pgp.el

diff --git a/mime-pgp.el b/mime-pgp.el
index 3d3590a..8aa0c40 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -61,7 +61,7 @@
         (the-buf (current-buffer))
         (mother mime-preview-buffer)
         (mode major-mode)
-        text-decoder)
+        representation-type)
     (set-buffer (get-buffer-create new-name))
     (erase-buffer)
     (insert-buffer-substring the-buf start end)
@@ -83,9 +83,9 @@
           (while (re-search-forward "^- -" nil t)
             (replace-match "-")
             )
-          (setq text-decoder
-                (cdr (or (assq mode mime-text-decoder-alist)
-                         (assq t    mime-text-decoder-alist))))
+          (setq representation-type
+                (cdr (or (assq mode mime-raw-representation-type-alist)
+                         (assq t    mime-raw-representation-type-alist))))
           )
          ((progn
             (goto-char (point-min))
@@ -96,22 +96,14 @@
                          (and
                           (search-forward "\n\n")
                           (match-end 0)))
-          (setq text-decoder (function mime-text-decode-buffer))
+          (setq representation-type (function mime-text-decode-buffer))
           ))
     (setq major-mode 'mime-show-message-mode)
-    (setq mime-text-decoder text-decoder)
+    (setq mime-raw-representation-type representation-type)
     (save-window-excursion (mime-view-mode mother))
     (set-window-buffer p-win mime-preview-buffer)
     ))
 
-(set-atype 'mime-acting-condition
-          '((type . application)(subtype . pgp)
-            (method . mime-method-for-application/pgp)))
-
-(set-atype 'mime-acting-condition
-          '((type . text)(subtype . x-pgp)
-            (method . mime-method-for-application/pgp)))
-
 
 ;;; @ Internal method for multipart/signed
 ;;;
@@ -121,16 +113,12 @@
   "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
    ))
 
-(set-atype 'mime-acting-condition
-          '((type . multipart)(subtype . signed)
-            (method . mime-method-to-verify-multipart/signed)))
-
 
 ;;; @ Internal method for application/pgp-signature
 ;;;
@@ -182,16 +170,15 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
         (onum (if (> knum 0)
                   (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))
         (sig-file (concat orig-file ".sig"))
         )
-    (write-region-as-binary (mime-entity-point-min oinfo)
-                           (mime-entity-point-max oinfo)
-                           orig-file)
+    (mime-raw-write-region (mime-entity-point-min oinfo)
+                          (mime-entity-point-max oinfo)
+                          orig-file)
     (save-excursion (mime-show-echo-buffer))
     (mime-write-decoded-region (save-excursion
                                 (goto-char start)
@@ -231,10 +218,6 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (delete-file sig-file)
     ))
 
-(set-atype 'mime-acting-condition
-          '((type . application)(subtype . pgp-signature)
-            (method . mime-method-to-verify-application/pgp-signature)))
-
 
 ;;; @ Internal method for application/pgp-encrypted
 ;;;
@@ -247,7 +230,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))
@@ -255,10 +238,6 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (mime-method-for-application/pgp obeg oend cal)
     ))
 
-(set-atype 'mime-acting-condition
-          '((type . application)(subtype . pgp-encrypted)
-            (method . mime-method-to-decrypt-application/pgp-encrypted)))
-
 
 ;;; @ Internal method for application/pgp-keys
 ;;;
@@ -283,10 +262,6 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (kill-buffer (current-buffer))
     ))
 
-(set-atype 'mime-acting-condition
-          '((type . application)(subtype . pgp-keys)
-            (method . mime-method-to-add-application/pgp-keys)))
-
         
 ;;; @ end
 ;;;