Sync up with semi-1_4_0_9.

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

diff --git a/mime-pgp.el b/mime-pgp.el
index ab24633..c2c3f24 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -104,13 +104,17 @@
     (set-window-buffer p-win mime-preview-buffer)
     ))
 
-(set-atype 'mime-acting-condition
-          '((type . application)(subtype . pgp)
-            (method . mime-method-for-application/pgp)))
+;; (ctree-set-calist-strictly
+;;  'mime-preview-condition '((type . application)(subtype . pgp)
+;;                            (message-button . visible)))
 
-(set-atype 'mime-acting-condition
-          '((type . text)(subtype . x-pgp)
-            (method . mime-method-for-application/pgp)))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition '((type . application)(subtype . pgp)
+;;                           (method . mime-method-for-application/pgp)))
+
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition '((type . text)(subtype . x-pgp)
+;;                           (method . mime-method-for-application/pgp)))
 
 
 ;;; @ Internal method for multipart/signed
@@ -121,15 +125,16 @@
   "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)))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . multipart)(subtype . signed)
+;;    (method . mime-method-to-verify-multipart/signed)))
 
 
 ;;; @ Internal method for application/pgp-signature
@@ -182,35 +187,21 @@ 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"))
         )
-    (save-excursion
-      (let ((p-min (mime-entity-info-point-min oinfo))
-           (p-max (mime-entity-info-point-max oinfo))
-           )
-       (set-buffer (get-buffer-create mime-temp-buffer-name))
-       (insert-buffer-substring raw-buf p-min p-max)
-       )
-      (goto-char (point-min))
-      (while (re-search-forward "\n" nil t)
-       (replace-match "\r\n")
-       )
-      (write-region-as-binary (point-min)(point-max) orig-file)
-      (kill-buffer (current-buffer))
-      )
+    (mime-raw-write-region (mime-entity-point-min oinfo)
+                          (mime-entity-point-max oinfo)
+                          orig-file)
     (save-excursion (mime-show-echo-buffer))
-    (let ((p-min (save-excursion
-                  (goto-char start)
-                  (and (search-forward "\n\n")
-                       (match-end 0))
-                  )))
-      (mime-write-decoded-region p-min end sig-file encoding)
-      )
+    (mime-write-decoded-region (save-excursion
+                                (goto-char start)
+                                (and (search-forward "\n\n")
+                                     (match-end 0))
+                                ) end sig-file encoding)
     (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
        (let (pgp-id)
          (save-excursion
@@ -244,9 +235,10 @@ 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)))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . application)(subtype . pgp-signature)
+;;    (method . mime-method-to-verify-application/pgp-signature)))
 
 
 ;;; @ Internal method for application/pgp-encrypted
@@ -260,17 +252,18 @@ 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-info-point-min oinfo))
-        (oend (mime-entity-info-point-max oinfo))
+        (obeg (mime-entity-point-min oinfo))
+        (oend (mime-entity-point-max oinfo))
         )
     (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)))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . application)(subtype . pgp-encrypted)
+;;    (method . mime-method-to-decrypt-application/pgp-encrypted)))
 
 
 ;;; @ Internal method for application/pgp-keys
@@ -296,9 +289,10 @@ 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)))
+;; (ctree-set-calist-strictly
+;;  'mime-acting-condition
+;;  '((type . application)(subtype . pgp-keys)
+;;    (method . mime-method-to-add-application/pgp-keys)))
 
         
 ;;; @ end