update.

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

diff --git a/pgg-gpg.el b/pgg-gpg.el
index dc0bc61..d6bda0d 100644 (file)
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -92,9 +92,10 @@
     (with-current-buffer (get-buffer-create output-buffer)
       (buffer-disable-undo)
       (erase-buffer))
-    (setq process
-         (apply #'start-process-shell-command "*GnuPG*" output-buffer
-                program args))
+    (as-binary-process
+     (setq process
+          (apply #'start-process-shell-command "*GnuPG*" output-buffer
+                 program args)))
     (set-process-sentinel process 'ignore)
     (when passphrase
       (process-send-string process (concat passphrase "\n")))
@@ -157,9 +158,12 @@
                         (mapcar (lambda (rcpt) 
                                   (list "--remote-user" 
                                         (concat "\"" rcpt "\""))) 
-                                recipients))))))
+                                (append recipients
+                                        (if pgg-encrypt-for-me
+                                            (list pgg-gpg-user-id)))))))
+         ))
     (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end pgg-gpg-program args)
+      (pgg-gpg-process-region start end nil pgg-gpg-program args)
       )
     (pgg-process-when-success
       (pgg-convert-lbt-region (point-min)(point-max) 'LF))
@@ -203,9 +207,10 @@
                             (progn (beginning-of-line 2)
                                    (point))
                             (point-max))))))
-         (pgg-add-passphrase-cache 
-          (cdr (assq 'key-identifier packet))
-          passphrase))))
+         (if pgg-cache-passphrase
+             (pgg-add-passphrase-cache 
+              (cdr (assq 'key-identifier packet))
+              passphrase)))))
     ))
 
 (luna-define-method verify-region ((scheme pgg-scheme-gpg) 
@@ -274,4 +279,3 @@
 (provide 'pgg-gpg)
 
 ;;; pgg-gpg.el ends here
-