tm 7.56.

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

diff --git a/tm-pgp.el b/tm-pgp.el
index 2822539..09a0ec0 100644 (file)
--- a/tm-pgp.el
+++ b/tm-pgp.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/7
 ;;; Version:
-;;;    $Id: tm-pgp.el,v 7.10 1996/02/03 00:56:20 morioka Exp $
+;;;    $Id: tm-pgp.el,v 7.13 1996/04/27 15:11:21 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, PGP, security
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -53,8 +53,8 @@
         (cur-buf (current-buffer))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime::article/preview-buffer)
-        (code-converter (function mime-viewer/default-code-convert-region))
-        str)
+        (mode major-mode)
+        code-converter str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)
     (erase-buffer)
@@ -80,17 +80,28 @@
           (while (re-search-forward "^- -" nil t)
             (replace-match "-")
             )
+          (setq code-converter
+                (or
+                 (cdr (assq mode mime-viewer/code-converter-alist))
+                 (function mime-viewer/default-code-convert-region)))
           )
          ((progn
             (goto-char (point-min))
             (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
             )
-          (mc-decrypt)
+          (let ((program-coding-system-alist
+                 (if (boundp 'program-coding-system-alist)
+                     (cons '((nil . ".*pgp.*") *noconv* . *noconv*)
+                           program-coding-system-alist))
+                 ))
+            (mc-decrypt)
+            )
           (goto-char (point-min))
           (delete-region (point-min)
                          (and
                           (search-forward "\n\n")
                           (match-end 0)))
+          (setq code-converter (function mime/code-convert-region-to-emacs))
           ))
     (setq major-mode 'mime/show-message-mode)
     (setq mime::article/code-converter code-converter)