2006-04-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 4ea4ccf..a35e206 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -711,6 +711,8 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
             (buffer-string))))
        (progn
          (erase-buffer)
+         ;; Treat data which pgg returns as a unibyte string.
+         (mm-disable-multibyte)
          (insert-buffer-substring pgg-output-buffer)
          (goto-char (point-min))
          (while (search-forward "\r\n" nil t)
@@ -818,6 +820,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 +848,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