From d08c5abcac43a30101fa2b842e678f0cca3be14b Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Sat, 15 Jul 2000 10:25:32 +0000
Subject: [PATCH] * lisp/gnus-art.el (gnus-article-setup-buffer): Set
 gnus-original-article-buffer as unibyte.
 (gnus-request-article-this-buffer): Ditto.

* lisp/nnimap.el (nnimap-callback): Don't use nnimap-demule.
(nnimap-request-article-part): Ditto.

* lisp/imap.el (imap-open): Set process buffer as unibyte.
---
 lisp/gnus-art.el |    2 ++
 lisp/imap.el     |    1 +
 lisp/nnimap.el   |   15 ++++++---------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0332dda..64a2c46 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2854,6 +2854,7 @@ commands:
     ;; Init original article buffer.
     (save-excursion
       (set-buffer (gnus-get-buffer-create gnus-original-article-buffer))
+      (set-buffer-multibyte nil)
       (setq major-mode 'gnus-original-article-mode)
       (make-local-variable 'gnus-original-article))
     (if (get-buffer name)
@@ -4249,6 +4250,7 @@ If given a prefix, show the hidden text instead."
 	  (if (get-buffer gnus-original-article-buffer)
 	      (set-buffer gnus-original-article-buffer)
 	    (set-buffer (gnus-get-buffer-create gnus-original-article-buffer))
+	    (set-buffer-multibyte nil)
 	    (buffer-disable-undo)
 	    (setq major-mode 'gnus-original-article-mode)
 	    (setq buffer-read-only t))
diff --git a/lisp/imap.el b/lisp/imap.el
index 919a250..f0a44d6 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -761,6 +761,7 @@ necessery.  If nil, the buffer name is generated."
     (if (imap-opened buffer)
 	(imap-close buffer))
     (mapcar 'make-variable-buffer-local imap-local-variables)
+    (set-buffer-multibyte nil)
     (buffer-disable-undo)
     (setq imap-server (or server imap-server))
     (setq imap-port (or port imap-port))
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index cd14bc9..c188f92 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -625,12 +625,11 @@ function is generally only called when Gnus is shutting down."
   (with-current-buffer nnimap-callback-buffer
     (insert
      (with-current-buffer nnimap-server-buffer
-       (nnimap-demule
-        (if (imap-capability 'IMAP4rev1) 
-            ;; xxx don't just use car? alist doesn't contain
-            ;; anything else now, but it might...
-            (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
-          (imap-message-get (imap-current-message) 'RFC822)))))
+       (if (imap-capability 'IMAP4rev1) 
+	   ;; xxx don't just use car? alist doesn't contain
+	   ;; anything else now, but it might...
+	   (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
+	 (imap-message-get (imap-current-message) 'RFC822))))
     (nnheader-ms-strip-cr)
     (funcall nnimap-callback-callback-function t)))
 
@@ -650,9 +649,7 @@ function is generally only called when Gnus is shutting down."
 	      (let ((data (imap-fetch article part prop nil
 				      nnimap-server-buffer)))
 		(when data
-		  (insert (nnimap-demule (if detail
-					     (nth 2 (car data))
-					   data)))
+		  (insert (if detail (nth 2 (car data)) data))
 		  (nnheader-ms-strip-cr)
 		  (gnus-message 9
 				"nnimap: Fetching (part of) article %d...done"
-- 
1.7.10.4