`mime/temp-buffer-name' -> `mime-temp-buffer-name'.

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

diff --git a/mime-pgp.el b/mime-pgp.el
index 69c9c80..da89dac 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -5,7 +5,7 @@
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/12/7
 ;;     Renamed: 1997/2/27 from tm-pgp.el
-;; Version: $Id: mime-pgp.el,v 0.11 1997-03-15 22:40:50 morioka Exp $
+;; Version: $Id: mime-pgp.el,v 0.20 1997-07-02 16:28:49 morioka Exp $
 ;; Keywords: PGP, security, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -50,11 +50,11 @@
 
 (defun mime-article/view-application/pgp (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
-        (p-win (or (get-buffer-window mime::article/preview-buffer)
+        (p-win (or (get-buffer-window mime-view-buffer)
                    (get-largest-window)))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (the-buf (current-buffer))
-        (mother mime::article/preview-buffer)
+        (mother mime-view-buffer)
         (mode major-mode)
         text-decoder)
     (set-buffer (get-buffer-create new-name))
@@ -95,20 +95,20 @@
                          (and
                           (search-forward "\n\n")
                           (match-end 0)))
-          (setq text-decoder (function mime-charset/decode-buffer))
+          (setq text-decoder (function mime-text-decode-buffer))
           ))
-    (setq major-mode 'mime/show-message-mode)
-    (setq mime-raw::text-decoder text-decoder)
+    (setq major-mode 'mime-show-message-mode)
+    (setq mime-text-decoder text-decoder)
     (save-window-excursion (mime-view-mode mother))
-    (set-window-buffer p-win mime::article/preview-buffer)
+    (set-window-buffer p-win mime-view-buffer)
     ))
 
-(set-atype 'mime/content-decoding-condition
+(set-atype 'mime-acting-condition
           '((type . "application/pgp")
             (method . mime-article/view-application/pgp)
             ))
 
-(set-atype 'mime/content-decoding-condition
+(set-atype 'mime-acting-condition
           '((type . "text/x-pgp")
             (method . mime-article/view-application/pgp)
             ))
@@ -160,6 +160,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
          ))))
 
 (defun mime-article/check-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))
         (rcnum (reverse cnum))
@@ -168,20 +169,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-article/rcnum-to-cinfo (cons onum rmcnum)
                                             mime::article/content-info))
-        str kbuf
+        kbuf
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
         )
     (save-excursion
-      (setq str (buffer-substring
-                (mime::content-info/point-min oinfo)
-                (mime::content-info/point-max oinfo)
-                ))
-      (set-buffer (get-buffer-create mime/temp-buffer-name))
-      (insert str)
+      (let ((p-min (mime::content-info/point-min oinfo))
+           (p-max (mime::content-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")
@@ -189,25 +191,23 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       (as-binary-output-file (write-file orig-file))
       (kill-buffer (current-buffer))
       )
+    (save-excursion (mime-show-echo-buffer))
     (save-excursion
-      (mime-article/show-output-buffer)
-      )
-    (save-excursion
-      (setq str (buffer-substring
-                (save-excursion
-                  (goto-char beg)
-                  (and (search-forward "\n\n")
-                       (match-end 0)))
-                end))
-      (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name)))
-      (insert str)
+      (let ((p-min (save-excursion
+                    (goto-char beg)
+                    (and (search-forward "\n\n")
+                         (match-end 0))
+                    )))
+       (set-buffer (setq kbuf (get-buffer-create mime-temp-buffer-name)))
+       (insert-buffer-substring raw-buf p-min end)
+       )
       (mime-decode-region (point-min)(point-max) encoding)
       (as-binary-output-file (write-file sig-file))
       (or (mime::article/call-pgp-to-check-signature
-          mime/output-buffer-name orig-file)
+          mime-echo-buffer-name orig-file)
          (let (pgp-id)
            (save-excursion
-             (set-buffer mime/output-buffer-name)
+             (set-buffer mime-echo-buffer-name)
              (goto-char (point-min))
              (let ((regexp (cdr (assq (or mime-pgp-default-language 'en)
                                       mime-pgp-key-expected-regexp-alist))))
@@ -228,10 +228,10 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                (progn
                  (funcall (pgp-function 'fetch-key) (cons nil pgp-id))
                  (mime::article/call-pgp-to-check-signature
-                  mime/output-buffer-name orig-file)
+                  mime-echo-buffer-name orig-file)
                  ))
            ))
-      (let ((other-window-scroll-buffer mime/output-buffer-name))
+      (let ((other-window-scroll-buffer mime-echo-buffer-name))
        (scroll-other-window 8)
        )
       (kill-buffer kbuf)
@@ -239,7 +239,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       (delete-file sig-file)
       )))
 
-(set-atype 'mime/content-decoding-condition
+(set-atype 'mime-acting-condition
           '((type . "application/pgp-signature")
             (method . mime-article/check-pgp-signature)
             ))
@@ -265,7 +265,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (mime-article/view-application/pgp obeg oend cal)
     ))
 
-(set-atype 'mime/content-decoding-condition
+(set-atype 'mime-acting-condition
           '((type . "application/pgp-encrypted")
             (method . mime-article/decrypt-pgp)
             ))
@@ -294,7 +294,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (kill-buffer (current-buffer))
     ))
 
-(set-atype 'mime/content-decoding-condition
+(set-atype 'mime-acting-condition
           '((type . "application/pgp-keys")
             (method . mime-article/add-pgp-keys)
             ))