Don't use mm-with-unibyte-current in mml1991

* lisp/gnus/mml1991.el (mml1991-epg-sign): Don't use
mm-with-unibyte-current.

1 files changed, 14 insertions, 11 deletions

diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 6db81be05f3..140f7201d80 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -283,17 +283,20 @@ Whether the passphrase is cached at all is controlled by
     (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear))
            (signature (car pair)))
       (delete-region (point-min) (point-max))
-      (mm-with-unibyte-current-buffer
-        (insert signature)
-        (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 signature)
+         (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-epg-encrypt (cont &optional sign)