* lisp/gnus/mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed

mm-with-unibyte-current-buffer.  The buffer should not contain any
multibyte chars anyway at this stage.

2 files changed, 32 insertions, 27 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4aba3a27900..5a7ea842153 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed
+        mm-with-unibyte-current-buffer.  The buffer should not contain any
+        multibyte chars anyway at this stage.
+
 2011-05-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-urlify): Use shr-add-font to make underlines be less ugly
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 0ce74b1d765..a5d778845c1 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -137,33 +137,32 @@ Whether the passphrase is cached at all is controlled by
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (unless (bobp)
       (delete-region (point-min) (point)))
-    (mm-with-unibyte-current-buffer
-      (with-temp-buffer
-        (inline (mm-disable-multibyte))
-        (setq cipher (current-buffer))
-        (insert-buffer-substring text)
-        (unless (mc-encrypt-generic
-                 (or
-                  (message-options-get 'message-recipients)
-                  (message-options-set 'message-recipients
-                                       (read-string "Recipients: ")))
-                 nil
-                 (point-min) (point-max)
-                 (message-options-get 'message-sender)
-                 'sign)
-          (unless (> (point-max) (point-min))
-            (pop-to-buffer result-buffer)
-            (error "Encrypt error")))
-        (goto-char (point-min))
-        (while (re-search-forward "\r+$" nil t)
-          (replace-match "" t t))
-        (set-buffer text)
-        (delete-region (point-min) (point-max))
-        ;;(insert "Content-Type: application/pgp-encrypted\n\n")
-        ;;(insert "Version: 1\n\n")
-        (insert "\n")
-        (insert-buffer-substring cipher)
-        (goto-char (point-max))))))
+    (with-temp-buffer
+      (inline (mm-disable-multibyte))
+      (setq cipher (current-buffer))
+      (insert-buffer-substring text)
+      (unless (mc-encrypt-generic
+               (or
+                (message-options-get 'message-recipients)
+                (message-options-set 'message-recipients
+                                     (read-string "Recipients: ")))
+               nil
+               (point-min) (point-max)
+               (message-options-get 'message-sender)
+               'sign)
+        (unless (> (point-max) (point-min))
+          (pop-to-buffer result-buffer)
+          (error "Encrypt error")))
+      (goto-char (point-min))
+      (while (re-search-forward "\r+$" nil t)
+        (replace-match "" t t))
+      (set-buffer text)
+      (delete-region (point-min) (point-max))
+      ;;(insert "Content-Type: application/pgp-encrypted\n\n")
+      ;;(insert "Version: 1\n\n")
+      (insert "\n")
+      (insert-buffer-substring cipher)
+      (goto-char (point-max)))))
 
 ;; pgg wrapper