* mime-play.el (mime-play-entity): Use return value of

[elisp/semi.git] / pgg-pgp5.el

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index 1fe971e..e774ae4 100644 (file)
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(require 'mel) ; binary-to-text-funcall, binary-write-decoded-region
 (eval-when-compile (require 'pgg))
 
 (defgroup pgg-pgp5 ()
@@ -91,6 +92,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
                  (list (concat "2>" errors-file-name))))
         (shell-file-name pgg-pgp5-shell-file-name)
         (shell-command-switch pgg-pgp5-shell-command-switch)
+        (process-environment process-environment)
         (output-buffer pgg-output-buffer)
         (errors-buffer pgg-errors-buffer)
         (process-connection-type nil)
@@ -102,10 +104,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
       (setenv "PGPPASSFD" "0"))
     (unwind-protect
        (progn
-         (as-binary-process
-          (setq process
-                (apply #'start-process-shell-command "*PGP*" output-buffer
-                       program args)))
+         (setq process
+               (apply #'binary-funcall
+                      #'start-process-shell-command "*PGP*" output-buffer
+                      program args))
          (set-process-sentinel process #'ignore)
          (when passphrase
            (process-send-string process (concat passphrase "\n")))
@@ -209,7 +211,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (write-region-as-binary start end orig-file))
+         (binary-write-decoded-region start end orig-file))
       (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
@@ -242,7 +244,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
         (args
          (list "+verbose=1" "+batchmode=1" "+language=us" "-a"
                key-file)))
-    (write-region-as-raw-text-CRLF start end key-file)
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region start end key-file))
     (pgg-pgp5-process-region start end nil pgg-pgp5-pgpk-program args)
     (delete-file key-file)
     (pgg-process-when-success nil)))