From: yoichi <yoichi>
Date: Wed, 9 Apr 2003 00:04:51 +0000 (+0000)
Subject: * wl-util.el (wl-as-coding-system): Define for non-mule too.
X-Git-Tag: merged-trunk-to-elmo-mark-17~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ba6c1d385624402cabe51541f7da2a709fc05e1a;p=elisp%2Fwanderlust.git

* wl-util.el (wl-as-coding-system): Define for non-mule too.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c19fa71..a2ea8fd 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-09  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* wl-util.el (wl-as-coding-system): Define for non-mule too.
+
 2003-03-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-fldmgr.el (wl-fldmgr-delete): Move confirmation to elmo side,
diff --git a/wl/wl-util.el b/wl/wl-util.el
index 30f0740..6778a42 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -283,16 +283,20 @@ even when invalid character is contained."
 (put 'wl-as-mime-charset 'lisp-indent-function 1)
 
 (eval-and-compile
-  (if wl-on-mule3
-      (defmacro wl-as-coding-system (coding-system &rest body)
-	(` (let ((coding-system-for-read (, coding-system))
-		 (coding-system-for-write (, coding-system)))
-	     (,@ body))))
-    (if wl-on-mule
-	(defmacro wl-as-coding-system (coding-system &rest body)
-	  (` (let ((file-coding-system-for-read (, coding-system))
-		   (file-coding-system (, coding-system)))
-	       (,@ body)))))))
+  (cond
+   (wl-on-mule3
+    (defmacro wl-as-coding-system (coding-system &rest body)
+      (` (let ((coding-system-for-read (, coding-system))
+	       (coding-system-for-write (, coding-system)))
+	   (,@ body)))))
+   (wl-on-mule
+    (defmacro wl-as-coding-system (coding-system &rest body)
+      (` (let ((file-coding-system-for-read (, coding-system))
+	       (file-coding-system (, coding-system)))
+	   (,@ body)))))
+   (t
+    (defmacro wl-as-coding-system (coding-system &rest body)
+      (` (eval (,@ body)))))))
 
 (defmacro wl-as-mime-charset (mime-charset &rest body)
   (` (wl-as-coding-system (mime-charset-to-coding-system (, mime-charset))