From 4b82289f625fc085f2138db74ab1e9a1ec0740f3 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Thu, 13 Sep 2001 02:45:36 +0000
Subject: [PATCH] * wl-vars.el (toplevel): Require 'custom. (wl-trash-folder):
 Added to `wl-setting' group.

* elmo-mime.el (elmo-mime-display-as-is-coding-system): New user option.
(elmo-mime-display-as-is-internal): Use it.
---
 elmo/ChangeLog    |    4 ++++
 elmo/elmo-mime.el |    9 ++++++++-
 wl/ChangeLog      |    3 +++
 wl/wl-vars.el     |    7 +++----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 65434aa..adfd912 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,9 @@
 2001-09-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* elmo-mime.el (elmo-mime-display-as-is-coding-system): New user
+	option.
+	(elmo-mime-display-as-is-internal): Use it.
+
 	* acap.el (acap-read-passphrase): Use `ange-ftp-read-passwd'
 	if `read-passwd' is not defined.
 
diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el
index 037513b..cd2fa19 100644
--- a/elmo/elmo-mime.el
+++ b/elmo/elmo-mime.el
@@ -53,6 +53,12 @@ value is used."
 		 (function :tag "Function"))
   :group 'elmo)
 
+(defcustom elmo-mime-display-as-is-coding-system (if (boundp 'MULE)
+						     '*autoconv* 'undecided)
+  "*Coding system used when message is displayed as is."
+  :type 'symbol
+  :group 'elmo)
+
 (luna-define-method initialize-instance :after ((entity mime-elmo-buffer-entity)
 						&rest init-args)
   entity)
@@ -290,7 +296,8 @@ Return non-nil if cache is used."
       (set-buffer-multibyte nil)
       (mime-insert-entity message)
       (set-buffer-multibyte t)
-      (decode-coding-region (point-min) (point-max) 'undecided)
+      (decode-coding-region (point-min) (point-max)
+			    elmo-mime-display-as-is-coding-system)
       (save-restriction
 	(std11-narrow-to-header)
 	(run-hooks 'elmo-message-header-inserted-hook))
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0a6d1c8..9cb581b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-vars.el (toplevel): Require 'custom.
+	(wl-trash-folder): Added to `wl-setting' group.
+
 	* wl-addrmgr.el (wl-addrmgr-goto-top): Fixed problem when no entry
 	exists.
 	(wl-addrmgr-draw): Insert empty line when no entry exists.
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 1e0a120..cd5a79e 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -33,9 +33,7 @@
 
 (require 'elmo-vars)
 (require 'elmo-util)
-
-(if (module-installed-p 'custom)
-    (require 'custom))
+(require 'custom)
 
 ;;; Customizable Variables
 
@@ -210,7 +208,8 @@ If you don't have multiple e-mail addresses, you don't have to set this."
 (defcustom wl-trash-folder "+trash"
   "*Trash folder"
   :type 'string
-  :group 'wl)
+  :group 'wl
+  :group 'wl-setting)
 (defcustom wl-queue-folder "+queue"
   "*Queue folder"
   :type 'string
-- 
1.7.10.4