This commit was generated by cvs2svn to compensate for changes in r533,

[elisp/tm.git] / tm-pgp.el

diff --git a/tm-pgp.el b/tm-pgp.el
index 3b439fd..d6c198a 100644 (file)
--- a/tm-pgp.el
+++ b/tm-pgp.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/12/7
-;; Version: $Id: tm-pgp.el,v 7.30 1997/02/11 08:57:58 morioka Exp $
+;; Version: $Id: tm-pgp.el,v 7.33 1997/02/13 14:51:04 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, PGP, security
 
 ;; This file is part of tm (Tools for MIME).
@@ -42,23 +42,6 @@
 
 (require 'tm-play)
 
-(defvar pgp-function-alist
-  '((verify    mc-verify               "mc-toplev")
-    (decrypt   mc-decrypt              "mc-toplev")
-    (fetch-key mc-pgp-fetch-key        "mc-pgp")
-    (snarf-keys        mc-snarf-keys           "mc-toplev")
-    ))
-
-(defsubst pgp-function (method)
-  (car (cdr (assq method pgp-function-alist)))
-  )
-
-(mapcar (function
-        (lambda (method)
-          (autoload (second method)(third method))
-          ))
-       pgp-function-alist)
-
 
 ;;; @ internal method for application/pgp
 ;;;
@@ -67,13 +50,15 @@
 (defun mime-article/view-application/pgp (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
         (cur-buf (current-buffer))
+        (p-win (or (get-buffer-window mime::article/preview-buffer)
+                   (get-largest-window)))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime::article/preview-buffer)
         (mode major-mode)
         code-converter
         (str (buffer-substring beg end))
         )
-    (switch-to-buffer new-name)
+    (set-buffer (get-buffer-create new-name))
     (erase-buffer)
     (insert str)
     (cond ((progn
@@ -116,7 +101,8 @@
           ))
     (setq major-mode 'mime/show-message-mode)
     (setq mime::article/code-converter code-converter)
-    (mime/viewer-mode mother)
+    (save-window-excursion (mime/viewer-mode mother))
+    (set-window-buffer p-win mime::article/preview-buffer)
     ))
 
 (set-atype 'mime/content-decoding-condition