(mime-article/check-pgp-signature): Abolish unused local variable

[elisp/semi.git] / mime-pgp.el

diff --git a/mime-pgp.el b/mime-pgp.el
index 2c0baed..16b450a 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -5,7 +5,7 @@
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/12/7
 ;;     Renamed: 1997/2/27 from tm-pgp.el
-;; Version: $Id: mime-pgp.el,v 0.3 1997-03-15 19:25:25 morioka Exp $
+;; Version: $Id: mime-pgp.el,v 0.7 1997-03-15 21:06:10 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, PGP, security
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -50,7 +50,6 @@
 
 (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)
                    (get-largest-window)))
         (new-name (format "%s-%s" (buffer-name) cnum))
@@ -84,9 +83,8 @@
             (replace-match "-")
             )
           (setq code-converter
-                (or
-                 (cdr (assq mode mime-viewer/code-converter-alist))
-                 (function mime-viewer/default-code-convert-region)))
+                (cdr (or (assq mode mime-text-decoder-alist)
+                         (assq t    mime-text-decoder-alist))))
           )
          ((progn
             (goto-char (point-min))
@@ -121,6 +119,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, ...")
@@ -139,11 +140,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)
@@ -157,8 +157,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)
@@ -172,7 +171,7 @@ 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
+        str kbuf
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
@@ -279,7 +278,6 @@ 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)))