projects
/
elisp
/
tm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tm 7.85.
[elisp/tm.git]
/
tm-pgp.el
diff --git
a/tm-pgp.el
b/tm-pgp.el
index
09a0ec0
..
e5196d4
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.
;;; 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:
;;;
;;; 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.13 1996/04/27 15:11:21 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).
;;; Keywords: mail, news, MIME, multimedia, PGP, security
;;;
;;; This file is part of tm (Tools for MIME).
@@
-89,19
+89,13
@@
(goto-char (point-min))
(re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
)
(goto-char (point-min))
(re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
)
- (let ((program-coding-system-alist
- (if (boundp 'program-coding-system-alist)
- (cons '((nil . ".*pgp.*") *noconv* . *noconv*)
- program-coding-system-alist))
- ))
- (mc-decrypt)
- )
+ (as-binary-process (mc-decrypt))
(goto-char (point-min))
(delete-region (point-min)
(and
(search-forward "\n\n")
(match-end 0)))
(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 code-converter (function mime-charset/decode-buffer))
))
(setq major-mode 'mime/show-message-mode)
(setq mime::article/code-converter code-converter)
))
(setq major-mode 'mime/show-message-mode)
(setq mime::article/code-converter code-converter)
@@
-175,8
+169,7
@@
(replace-match "\r\n")
)
(let ((mc-flag nil) ; for Mule
(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
kanji-flag ; for NEmacs
(emx-binary-mode t) ; for OS/2
jka-compr-compression-info-list ; for jka-compr
@@
-187,6
+180,9
@@
(kill-buffer (current-buffer))
)
(save-excursion
(kill-buffer (current-buffer))
)
(save-excursion
+ (mime-article/show-output-buffer)
+ )
+ (save-excursion
(setq str (buffer-substring
(save-excursion
(goto-char beg)
(setq str (buffer-substring
(save-excursion
(goto-char beg)
@@
-195,10
+191,9
@@
end))
(set-buffer (setq kbuf (get-buffer-create mime/temp-buffer-name)))
(insert str)
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
(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
kanji-flag ; for NEmacs
(emx-binary-mode t) ; for OS/2
jka-compr-compression-info-list ; for jka-compr
@@
-206,8
+201,6
@@
require-final-newline)
(write-file sig-file)
)
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)
;;(get-buffer-create mime/output-buffer-name)
(or (mime::article/call-pgp-to-check-signature
mime/output-buffer-name orig-file)
@@
-291,7
+284,7
@@
(if (re-search-forward "^\n" nil t)
(delete-region (point-min) (match-end 0))
)
(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))
))
(mc-snarf-keys)
(kill-buffer (current-buffer))
))