X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-pgp.el;h=56d799f3e928a5e8b344ae0952a6721546c70f89;hb=d52a22861beba8d4eb3c41c6a41601da7c138554;hp=cef68e1a21c100521cf4694610bd6754952bdfc3;hpb=213eb88df7a48d406d3c9aea4f00d656df95fe03;p=elisp%2Fsemi.git

diff --git a/mime-pgp.el b/mime-pgp.el
index cef68e1..56d799f 100644
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -4,8 +4,9 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/12/7
-;; Version: $Id: mime-pgp.el,v 0.0 1997-02-27 08:09:32 tmorioka Exp $
-;; Keywords: mail, news, MIME, multimedia, PGP, security
+;;	Renamed: 1997/2/27 from tm-pgp.el
+;; Version: $Id: mime-pgp.el,v 0.15 1997-03-18 14:45:47 morioka Exp $
+;; Keywords: PGP, security, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
 
@@ -49,18 +50,16 @@
 
 (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)
+	 (p-win (or (get-buffer-window mime-view-buffer)
 		    (get-largest-window)))
 	 (new-name (format "%s-%s" (buffer-name) cnum))
-	 (mother mime::article/preview-buffer)
+	 (the-buf (current-buffer))
+	 (mother mime-view-buffer)
 	 (mode major-mode)
-	 code-converter
-	 (str (buffer-substring beg end))
-	 )
+	 text-decoder)
     (set-buffer (get-buffer-create new-name))
     (erase-buffer)
-    (insert str)
+    (insert-buffer-substring the-buf beg end)
     (cond ((progn
 	     (goto-char (point-min))
 	     (re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
@@ -82,10 +81,9 @@
 	   (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)))
+	   (setq text-decoder
+		 (cdr (or (assq mode mime-text-decoder-alist)
+			  (assq t    mime-text-decoder-alist))))
 	   )
 	  ((progn
 	     (goto-char (point-min))
@@ -97,12 +95,12 @@
 			  (and
 			   (search-forward "\n\n")
 			   (match-end 0)))
-	   (setq code-converter (function mime-charset/decode-buffer))
+	   (setq text-decoder (function mime-text-decode-buffer))
 	   ))
-    (setq major-mode 'mime/show-message-mode)
-    (setq mime::article/code-converter code-converter)
-    (save-window-excursion (mime/viewer-mode mother))
-    (set-window-buffer p-win mime::article/preview-buffer)
+    (setq major-mode 'mime-show-message-mode)
+    (setq mime-text-decoder text-decoder)
+    (save-window-excursion (mime-view-mode mother))
+    (set-window-buffer p-win mime-view-buffer)
     ))
 
 (set-atype 'mime/content-decoding-condition
@@ -120,6 +118,9 @@
 ;;;
 ;;; It is based on RFC 2015.
 
+(defvar mime-pgp-command "pgp"
+  "*Name of the PGP command.")
+
 (defvar mime-pgp-default-language 'en
   "*Symbol of language for pgp.
 It should be ISO 639 2 letter language code such as en, ja, ...")
@@ -138,11 +139,10 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     (erase-buffer)
     )
   (let* ((lang (or mime-pgp-default-language 'en))
-	 (status
-	  (call-process-region (point-min)(point-max)
-			       "pgp" nil output-buffer nil orig-file
-			       (format "+language=%s" lang)
-			       ))
+	 (status (call-process-region (point-min)(point-max)
+				      mime-pgp-command
+				      nil output-buffer nil
+				      orig-file (format "+language=%s" lang)))
 	 (regexp (cdr (assq lang mime-pgp-good-signature-regexp-alist)))
 	 )
     (if (= status 0)
@@ -156,8 +156,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 		  (buffer-substring (match-beginning 0) (match-end 0))
 		  )
 		 (t
-		  "Bad signature"
-		  )))
+		  "Bad signature")))
 	  ))))
 
 (defun mime-article/check-pgp-signature (beg end cal)
@@ -171,8 +170,8 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 		 (1+ knum)))
 	 (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
 					     mime::article/content-info))
-	 status str kbuf
-	 (basename (expand-file-name "tm" mime/tmp-dir))
+	 str kbuf
+	 (basename (expand-file-name "tm" mime-temp-directory))
 	 (orig-file (make-temp-name basename))
 	 (sig-file (concat orig-file ".sig"))
 	 )
@@ -278,12 +277,8 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 
 (defun mime-article/add-pgp-keys (beg end cal)
   (let* ((cnum (mime-article/point-content-number beg))
-	 (cur-buf (current-buffer))
 	 (new-name (format "%s-%s" (buffer-name) cnum))
-	 (mother mime::article/preview-buffer)
-	 (charset (cdr (assoc "charset" cal)))
 	 (encoding (cdr (assq 'encoding cal)))
-	 (mode major-mode)
 	 str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)