From: kaoru <kaoru>
Date: Wed, 20 Feb 2008 12:55:07 +0000 (+0000)
Subject: * elmo-util.el (elmo-add-name-to-file, elmo-field-body): Use
X-Git-Tag: wl-2_15_6-fixes~21
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fwanderlust.git;a=commitdiff_plain;h=aaf6e98b6b5641ac84e40f4703938be08e6593ef

* elmo-util.el (elmo-add-name-to-file, elmo-field-body): Use
`eval-and-compile' for suppress compile warnings.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index db817e2..39d7ec9 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+	* elmo-util.el (elmo-add-name-to-file, elmo-field-body): Use
+	`eval-and-compile' for suppress compile warnings.
+
 	* elmo-vars.el (dynamic-link, dynamic-call): Use `defalias-maybe'
 	instead of `defun-maybe'
 
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 430ca82..f5191fb 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -62,11 +62,12 @@
 (fset 'elmo-base64-decode-string
       (mel-find-function 'mime-decode-string "base64"))
 
-(if elmo-use-hardlink
-    (defalias 'elmo-add-name-to-file 'add-name-to-file)
-  (defun elmo-add-name-to-file
-    (filename newname &optional ok-if-already-exists)
-    (copy-file filename newname ok-if-already-exists t)))
+(eval-and-compile
+  (if elmo-use-hardlink
+      (defalias 'elmo-add-name-to-file 'add-name-to-file)
+    (defun elmo-add-name-to-file
+      (filename newname &optional ok-if-already-exists)
+      (copy-file filename newname ok-if-already-exists t))))
 
 (defmacro elmo-set-work-buf (&rest body)
   "Execute BODY on work buffer.  Work buffer remains."
@@ -1278,9 +1279,10 @@ MESSAGE is a doing part of progress message."
     (and (eq (car diff) 0)
 	 (< diff-time (nth 1 diff)))))
 
-(if (fboundp 'std11-fetch-field)
-    (defalias 'elmo-field-body 'std11-fetch-field) ;;no narrow-to-region
-  (defalias 'elmo-field-body 'std11-field-body))
+(eval-and-compile
+  (if (fboundp 'std11-fetch-field)
+      (defalias 'elmo-field-body 'std11-fetch-field) ;;no narrow-to-region
+    (defalias 'elmo-field-body 'std11-field-body)))
 
 (defun elmo-unfold-field-body (name)
   (let ((value (elmo-field-body name)))