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

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

diff --git a/tm-pgp.el b/tm-pgp.el
index 2822539..4e8635e 100644 (file)
--- a/tm-pgp.el
+++ b/tm-pgp.el
@@ -2,13 +2,13 @@
 ;;; tm-pgp.el --- tm-view internal methods for PGP.
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1995 MORIOKA Tomohiko
+;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; 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.18 1996/07/15 14:03:34 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,22 @@
           (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)
+          (as-binary-process (mc-decrypt))
           (goto-char (point-min))
           (delete-region (point-min)
                          (and
                           (search-forward "\n\n")
                           (match-end 0)))
+          (setq code-converter (function mime-charset-decode-region))
           ))
     (setq major-mode 'mime/show-message-mode)
     (setq mime::article/code-converter code-converter)
@@ -164,8 +169,7 @@
        (replace-match "\r\n")
        )
       (let ((mc-flag nil)                   ; for Mule
-           (file-coding-system
-            (if (featurep 'mule) *noconv*))
+           (file-coding-system *noconv*)
            kanji-flag                      ; for NEmacs
            (emx-binary-mode t)             ; for OS/2
            jka-compr-compression-info-list ; for jka-compr
@@ -176,6 +180,9 @@
       (kill-buffer (current-buffer))
       )
     (save-excursion
+      (mime-article/show-output-buffer)
+      )
+    (save-excursion
       (setq str (buffer-substring
                 (save-excursion
                   (goto-char beg)
@@ -184,10 +191,9 @@
                 end))
       (set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name)))
       (insert str)
-      (mime/decode-region encoding (point-min)(point-max))
+      (mime-decode-region (point-min)(point-max) encoding)
       (let ((mc-flag nil)                   ; for Mule
-           (file-coding-system
-            (if (featurep 'mule) *noconv*))
+           (file-coding-system *noconv*)
            kanji-flag                      ; for NEmacs
            (emx-binary-mode t)             ; for OS/2
            jka-compr-compression-info-list ; for jka-compr
@@ -195,8 +201,6 @@
            require-final-newline)
        (write-file sig-file)
        )
-      ;;(define-program-coding-system (current-buffer) "pgp" *noconv*)
-      (mime-article/show-output-buffer)
       ;;(get-buffer-create mime/output-buffer-name)
       (or (mime::article/call-pgp-to-check-signature
           mime/output-buffer-name orig-file)
@@ -280,7 +284,7 @@
     (if (re-search-forward "^\n" nil t)
        (delete-region (point-min) (match-end 0))
       )
-    (mime/decode-region encoding (point-min)(point-max))
+    (mime-decode-region (point-min)(point-max) encoding)
     (mc-snarf-keys)
     (kill-buffer (current-buffer))
     ))