From: yamaoka <yamaoka>
Date: Mon, 5 Apr 1999 04:07:54 +0000 (+0000)
Subject: * (mime-mc-gpg-sign-region): Remove ("--passphrase-fd" "0") from the list of
X-Git-Tag: semi-pgpgpg_02~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7e1b72741ffc99472c5cedba60ddde2c6737e152;p=elisp%2Fsemi.git

* (mime-mc-gpg-sign-region): Remove ("--passphrase-fd" "0") from the list of
arguments.
(mime-mc-shell-file-name): New user option.
(mime-mc-pgp50-process-region, mime-mc-gpg-process-region): Use it.
---

diff --git a/mime-mc.el b/mime-mc.el
index c09bd8f..5657a5e 100644
--- a/mime-mc.el
+++ b/mime-mc.el
@@ -25,10 +25,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (load "expect" t)
-  )
-
 (require 'semi-def)
 (require 'mailcrypt)
 
@@ -57,6 +53,12 @@
 (defvar mc-pgp-path)
 (defvar mc-pgp-user-id)
 
+(defcustom mime-mc-shell-file-name "/bin/sh"
+  "File name to load inferior shells from.  Bourne shell or its equivalent
+\(not tcsh) is needed for \"2>\"."
+  :group 'mime
+  :type 'file)
+
 
 ;;; @ Generic functions
 ;;;
@@ -120,7 +122,7 @@ VERSION should be a string or a symbol."
   (beg end passwd program args parser bufferdummy boundary)
   (let ((obuf (current-buffer))
 	(process-connection-type nil)
-	(shell-file-name "/bin/sh") ;; ??? force? need sh (not tcsh) for "2>"
+	(shell-file-name mime-mc-shell-file-name)
 	; other local vars
 	mybuf
 	stderr-tempfilename stderr-buf
@@ -290,8 +292,7 @@ Content-Transfer-Encoding: 7bit
 	     (if unclear
 		 "--sign"
 	       "--clearsign"))
-	   (list "--passphrase-fd" "0"
-		 "--armor" "--batch" "--textmode" "--verbose"
+	   (list "--armor" "--batch" "--textmode" "--verbose"
 		 "--local-user" (cdr key))))
     (if mc-gpg-comment
 	(setq args (nconc args
@@ -339,7 +340,7 @@ Content-Transfer-Encoding: 7bit
   (beg end passwd program args parser &optional buffer boundary)
   (let ((obuf (current-buffer))
 	(process-connection-type nil)
-	(shell-file-name "/bin/sh")
+	(shell-file-name mime-mc-shell-file-name)
 	mybuf result rgn proc results)
     (unwind-protect
 	(progn