Synch to No Gnus 200602090547.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0ccf5b..18e1437 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 60d8e55..7007713 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 5c7e91f..696b0dc 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