tm 7.80.

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

diff --git a/tm-pgp.el b/tm-pgp.el
index 6cc7378..e5196d4 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.16 1996/06/27 14:26:56 morioka Exp $
+;;;    $Id: tm-pgp.el,v 7.19 1996/07/18 12:20:32 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, PGP, security
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -95,7 +95,7 @@
                          (and
                           (search-forward "\n\n")
                           (match-end 0)))
-          (setq code-converter (function mime-charset-decode-region))
+          (setq code-converter (function mime-charset/decode-buffer))
           ))
     (setq major-mode 'mime/show-message-mode)
     (setq mime::article/code-converter code-converter)
@@ -169,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
@@ -181,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)
@@ -191,8 +193,7 @@
       (insert str)
       (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
@@ -200,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)