2003-04-09 Yoichi NAKAYAMA <yoichi@geiin.org>

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

diff --git a/wl/ChangeLog b/wl/ChangeLog
index dd9445f..a01b567 100644 (file)
--- 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-02  Jeremy Shaw  <jeremy.shaw@lindows.com>
 
        * wl-draft.el (wl-draft-reply): Fixed.

diff --git a/wl/wl-util.el b/wl/wl-util.el
index 30f0740..9f8714b 100644 (file)
--- 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)
+      (` (progn (,@ body)))))))
 
 (defmacro wl-as-mime-charset (mime-charset &rest body)
   (` (wl-as-coding-system (mime-charset-to-coding-system (, mime-charset))