* mime-image.el (image-normalize): Use `write-region-as-binary'.

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

diff --git a/pgg-pgp.el b/pgg-pgp.el
index 448fd30..28e48cb 100644 (file)
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -86,9 +86,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")))
@@ -147,7 +148,10 @@
            "+language=us" "-fate"
            ,@(if recipients
                  (mapcar (lambda (rcpt) (concat "\"" rcpt "\""))
-                         recipients)))))
+                         (append recipients
+                                 (if pgg-encrypt-for-me
+                                     (list pgg-pgp-user-id))))))
+         ))
     (pgg-pgp-process-region start end nil
                            pgg-pgp-program args)
     (pgg-process-when-success nil)
@@ -179,15 +183,10 @@
         (args 
          (list (if clearsign "-fast" "-fbast")
                "+verbose=1" "+language=us" "+batchmode"
-               "-u" pgg-pgp-user-id))
-        (inhibit-read-only t)
-        buffer-read-only)
-    (pgg-as-lbt start end 'CRLF
-      (pgg-pgp-process-region start end passphrase 
-                             pgg-pgp-program args)
-      )
+               "-u" pgg-pgp-user-id)))
+    (pgg-pgp-process-region start end passphrase 
+                           pgg-pgp-program args)
     (pgg-process-when-success
-      (pgg-convert-lbt-region (point-min)(point-max) 'LF)
       (goto-char (point-min))
       (when (re-search-forward "^-+BEGIN PGP" nil t);XXX
        (let ((packet