_From Daiki Ueno <ueno(at)unixuser.org>

=======================================
* pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings in elisp.
(pgg-gpg-encrypt-symmetric-region): Ditto.
(pgg-gpg-sign-region): Ditto.

* pgg-def.el (pgg-text-mode): New variable.

* mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode.
(mml2015-pgg-encrypt): Ditto.

* mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode.
(mml1991-pgg-encrypt): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5a4b9d..3cc37cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2006-02-09  Daiki Ueno  <ueno@unixuser.org>
+
+       * pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings
+       in elisp.
+       (pgg-gpg-encrypt-symmetric-region): Ditto.
+       (pgg-gpg-sign-region): Ditto.
+
+       * pgg-def.el (pgg-text-mode): New variable.
+
+       * mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode.
+       (mml2015-pgg-encrypt): Ditto.
+
+       * mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode.
+       (mml1991-pgg-encrypt): Ditto.
+
 2006-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnfolder.el (nnfolder-insert-newsgroup-line): Use

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 761ce4f..0c6bb67 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -229,7 +229,8 @@
   (defvar pgg-output-buffer))
 
 (defun mml1991-pgg-sign (cont)
-  (let (headers cte)
+  (let ((pgg-text-mode t)
+       headers cte)
     ;; Don't sign headers.
     (goto-char (point-min))
     (while (not (looking-at "^$"))
@@ -261,7 +262,8 @@
     t))
 
 (defun mml1991-pgg-encrypt (cont &optional sign)
-  (let (cte)
+  (let ((pgg-text-mode t)
+       cte)
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:")

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 4ea4ccf..69d71ab 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -818,6 +818,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
        (boundary (mml-compute-boundary cont))
        (pgg-default-user-id (or (message-options-get 'mml-sender)
                                 pgg-default-user-id))
+       (pgg-text-mode t)
        entry)
     (unless (pgg-sign-region (point-min) (point-max))
       (pop-to-buffer mml2015-result-buffer)
@@ -845,6 +846,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
 
 (defun mml2015-pgg-encrypt (cont &optional sign)
   (let ((pgg-errors-buffer mml2015-result-buffer)
+       (pgg-text-mode t)
        (boundary (mml-compute-boundary cont)))
     (unless (pgg-encrypt-region (point-min) (point-max)
                                (split-string

diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 0b35646..058dca4 100644 (file)
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -83,6 +83,9 @@ Whether the passphrase is cached at all is controlled by
 (defvar pgg-scheme nil
   "Current scheme of PGP implementation.")
 
+(defvar pgg-text-mode nil
+  "If t, inform the recipient that the input is text.")
+
 (defmacro pgg-truncate-key-identifier (key)
   `(if (> (length ,key) 8) (substring ,key 8) ,key))
 

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 781df12..78db157 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -87,7 +87,9 @@
            (buffer-disable-undo)
            (erase-buffer)
            (if (file-exists-p output-file-name)
-               (let ((coding-system-for-read 'raw-text-dos))
+               (let ((coding-system-for-read (if pgg-text-mode
+                                                 'raw-text
+                                               'binary)))
                  (insert-file-contents output-file-name)))
            (set-buffer errors-buffer)
            (if (not (equal exit-status 0))
@@ -185,7 +187,8 @@ passphrase cache or user."
                            pgg-gpg-user-id))))
         (args
          (append
-          (list "--batch" "--textmode" "--armor" "--always-trust" "--encrypt")
+          (list "--batch" "--armor" "--always-trust" "--encrypt")
+          (if pgg-text-mode (list "--textmode"))
           (if sign (list "--sign" "--local-user" pgg-gpg-user-id))
           (if recipients
               (apply #'nconc
@@ -194,8 +197,7 @@ passphrase cache or user."
                              (append recipients
                                      (if pgg-encrypt-for-me
                                          (list pgg-gpg-user-id)))))))))
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (when sign
       (with-current-buffer pgg-errors-buffer
        ;; Possibly cache passphrase under, e.g. "jas", for future sign.
@@ -213,9 +215,9 @@ passphrase cache or user."
                         (pgg-read-passphrase
                          "GnuPG passphrase for symmetric encryption: ")))
         (args
-         (append (list "--batch" "--textmode" "--armor" "--symmetric" ))))
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+         (append (list "--batch" "--armor" "--symmetric" )
+                 (if pgg-text-mode (list "--textmode")))))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (pgg-process-when-success)))
 
 (defun pgg-gpg-decrypt-region (start end &optional passphrase)
@@ -277,13 +279,13 @@ passphrase cache or user."
                          (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
                          pgg-gpg-user-id)))
         (args
-         (list (if cleartext "--clearsign" "--detach-sign")
-               "--armor" "--batch" "--verbose"
-               "--local-user" pgg-gpg-user-id))
+         (append (list (if cleartext "--clearsign" "--detach-sign")
+                       "--armor" "--batch" "--verbose"
+                       "--local-user" pgg-gpg-user-id)
+                 (if pgg-text-mode (list "--textmode"))))
         (inhibit-read-only t)
         buffer-read-only)
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (with-current-buffer pgg-errors-buffer
       ;; Possibly cache passphrase under, e.g. "jas", for future sign.
       (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)