update.

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

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index 4ca4b16..8598e0e 100644 (file)
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -101,9 +101,10 @@
       (erase-buffer))
     (when passphrase
       (setenv "PGPPASSFD" "0"))
-    (setq process
-         (apply #'start-process-shell-command "*PGP*" output-buffer
-                program args))
+    (as-binary-process
+     (setq process
+          (apply #'start-process-shell-command "*PGP*" output-buffer
+                 program args)))
     (set-process-sentinel process 'ignore)
     (when passphrase
       (process-send-string process (concat passphrase "\n")))
@@ -160,7 +161,10 @@
                         (mapcar (lambda (rcpt) 
                                   (list "-r" 
                                         (concat "\"" rcpt "\""))) 
-                                recipients))))))
+                                (append recipients
+                                        (if pgg-encrypt-for-me
+                                            (list pgg-pgp5-user-id)))))))
+         ))
     (pgg-pgp5-process-region start end nil
                             pgg-pgp5-pgpe-program args)
     (pgg-process-when-success nil)
@@ -193,12 +197,9 @@
          (list (if clearsign "-fat" "-fbat")
                "+verbose=1" "+language=us" "+batchmode=1"
                "-u" pgg-pgp5-user-id)))
-    (pgg-as-lbt start end 'CRLF
-      (pgg-pgp5-process-region start end passphrase 
-                              pgg-pgp5-pgps-program args)
-      )
+    (pgg-pgp5-process-region start end passphrase 
+                            pgg-pgp5-pgps-program args)
     (pgg-process-when-success
-      (pgg-convert-lbt-region (point-min)(point-max) 'LF)
       (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
        (let ((packet 
               (cdr (assq 2 (pgg-parse-armor-region