X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-pgp.el;h=d34445bb2735e61968495295969b5b33d5c4ff23;hb=b184a5d453660cd595b026b95bef186276899d9e;hp=c005a22142867bdb2c0fdec99edad79a1e7d2259;hpb=366eec2c96d39c388ef6757e8540d85128b726e3;p=elisp%2Fsemi.git

diff --git a/pgg-pgp.el b/pgg-pgp.el
index c005a22..d34445b 100644
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -59,9 +59,6 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 (defvar pgg-pgp-user-id nil
   "PGP ID of your default identity.")
 
-(defvar pgg-pgp-messages-coding-system pgg-messages-coding-system
-  "Coding system used when reading from a PGP external process.")
-
 (defvar pgg-scheme-pgp-instance nil)
 
 ;;;###autoload
@@ -71,9 +68,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 	    (luna-make-entity 'pgg-scheme-pgp))))
 
 (defun pgg-pgp-process-region (start end passphrase program args)
-  (let* ((errors-file-name
-	  (concat temporary-file-directory
-		  (make-temp-name "pgg-errors")))
+  (let* ((errors-file-name (make-temp-file "pgg-errors"))
 	 (args
 	  (append args
 		  pgg-pgp-extra-args
@@ -93,8 +88,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
 	(progn
 	  (setq process
-		(apply #'binary-to-text-funcall
-		       pgg-pgp-messages-coding-system
+		(apply #'binary-funcall
 		       #'start-process-shell-command "*PGP*" output-buffer
 		       program args))
 	  (set-process-sentinel process #'ignore)
@@ -196,8 +190,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 
 (luna-define-method pgg-scheme-verify-region ((scheme pgg-scheme-pgp)
 					      start end &optional signature)
-  (let* ((basename (expand-file-name "pgg" temporary-file-directory))
-	 (orig-file (make-temp-name basename))
+  (let* ((orig-file (make-temp-file "pgg"))
 	 (args '("+verbose=1" "+batchmode" "+language=us"))
 	 (orig-mode (default-file-modes)))
     (unwind-protect
@@ -234,8 +227,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 (luna-define-method pgg-scheme-snarf-keys-region ((scheme pgg-scheme-pgp)
 						  start end)
   (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
-	 (basename (expand-file-name "pgg" temporary-file-directory))
-	 (key-file (make-temp-name basename))
+	 (key-file (make-temp-file "pgg"))
 	 (args
 	  (list "+verbose=1" "+batchmode" "+language=us" "-kaf"
 		key-file)))