From 8bb48834fb433f045ca02a69807b835dd08431de Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 17 Jul 2001 08:39:41 +0000
Subject: [PATCH] * wl-draft.el (wl-draft-yank-from-mail-reply-buffer): Use
 with-current-buffer.

* elmo-mime.el (elmo-mime-display-as-is-internal):
Adjust buffer-multibyte status.
---
 elmo/ChangeLog    |    5 +++++
 elmo/elmo-mime.el |   13 +++----------
 wl/ChangeLog      |    5 +++++
 wl/wl-draft.el    |    3 +--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b413170..23b47c6 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-mime.el (elmo-mime-display-as-is-internal):
+	Adjust buffer-multibyte status.
+
 2001-07-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo.el (elmo-msgdb-search): Use elmo-condition-in-msgdb-p instead
diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el
index 30d0dc4..e8977f6 100644
--- a/elmo/elmo-mime.el
+++ b/elmo/elmo-mime.el
@@ -285,21 +285,14 @@ Return non-nil if cache is used."
       (setq major-mode 'mime-view-mode)
       (setq mode-name "MIME-View")
 
+      ;; Humm...
+      (set-buffer-multibyte nil)
       (mime-insert-entity message)
-      ;(insert (mime-entity-body message))
-      ;(insert (mime-entity-body message))
-
+      (set-buffer-multibyte t)
       (decode-coding-region (point-min) (point-max) 'undecided)
-
       (save-restriction
 	(std11-narrow-to-header)
 	(run-hooks 'elmo-message-header-inserted-hook))
-;      (mime-display-entity message nil
-;			   `((entity-button . invisible)
-;			     (header . visible)
-;			     (major-mode . ,original-major-mode))
-;			   preview-buffer)
-
       (use-local-map
        (or keymap
 	   (if default-keymap-or-function
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 448074a..14593b4 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-draft.el (wl-draft-yank-from-mail-reply-buffer):
+	Use with-current-buffer.
+
 2001-07-14  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-score.el (wl-score-insert-help): Check `wl-message-buffer'
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 328722f..d8f2e41 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -424,8 +424,7 @@ Reply to author if WITH-ARG is non-nil."
   (save-restriction
     (narrow-to-region (point)(point))
     (insert
-     (save-excursion
-       (set-buffer mail-reply-buffer)
+     (with-current-buffer mail-reply-buffer
        (when decode-it
 	 (decode-mime-charset-region (point-min) (point-max)
 				     wl-mime-charset))
-- 
1.7.10.4