[Emacs-diffs] master 7fe8d82 2/7: Don't use mm-with-unibyte-current in mml1991

[Lars Ingebrigtsen]

branch: master
commit 7fe8d82924d92ea0d14861b74f8ce266e7bea52a
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Don't use mm-with-unibyte-current in mml1991
    
    * lisp/gnus/mml1991.el (mml1991-pgg-sign): Don't use
    mm-with-unibyte-current.
---
 lisp/gnus/mml1991.el |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index bb5c940..6db81be 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -200,17 +200,20 @@ Whether the passphrase is cached at all is controlled by
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))
     (delete-region (point-min) (point-max))
-    (mm-with-unibyte-current-buffer
-      (insert-buffer-substring pgg-output-buffer)
-      (goto-char (point-min))
-      (while (re-search-forward "\r+$" nil t)
-       (replace-match "" t t))
-      (when cte
-       (mm-encode-content-transfer-encoding cte))
-      (goto-char (point-min))
-      (when headers
-       (insert headers))
-      (insert "\n"))
+    (insert
+     (with-temp-buffer
+       (set-buffer-multibyte nil)
+       (insert-buffer-substring pgg-output-buffer)
+       (goto-char (point-min))
+       (while (re-search-forward "\r+$" nil t)
+        (replace-match "" t t))
+       (when cte
+        (mm-encode-content-transfer-encoding cte))
+       (goto-char (point-min))
+       (when headers
+        (insert headers))
+       (insert "\n")
+       (buffer-string)))
     t))
 
 (defun mml1991-pgg-encrypt (cont &optional sign)