From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 12 Feb 2016 04:51:13 +0000 (+1100)
Subject: Don't use mm-with-unibyte-current in mml1991
X-Git-Tag: emacs-26.0.90~2629
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7fe8d82924d92ea0d14861b74f8ce266e7bea52a;p=emacs.git

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

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

diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index bb5c940f173..6db81be05f3 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)