From: kaoru <kaoru>
Date: Tue, 19 Feb 2008 12:28:16 +0000 (+0000)
Subject: * wl-util.el: Move (eval-when-compile (require 'static)).
X-Git-Tag: wl-2_15_6-fixes~29
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62bd32794da4e4f6f35be9ffb4e0d1f27f97a3d1;p=elisp%2Fwanderlust.git

* wl-util.el: Move (eval-when-compile (require 'static)).
* wl-dnd.el: Add (eval-when-compile (require 'static)).
* wl-message.el: Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 877c714..6c9accc 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-19  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+	* wl-util.el: Move (eval-when-compile (require 'static)).
+	* wl-dnd.el: Add (eval-when-compile (require 'static)).
+	* wl-message.el: Ditto.
+
 	* wl-mime.el (wl-message-delete-current-part): Use
 	`insert-buffer-substring' instead of `insert-buffer'.
 	* wl-summary.el (wl-summary-switch-to-clone-buffer): Ditto.
diff --git a/wl/wl-dnd.el b/wl/wl-dnd.el
index 248effb..4aa4a42 100644
--- a/wl/wl-dnd.el
+++ b/wl/wl-dnd.el
@@ -28,6 +28,7 @@
 
 ;;; Code:
 ;;
+(eval-when-compile (require 'static))
 
 (static-cond
  ((featurep 'offix)
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 1584414..c7c22cd 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -29,6 +29,7 @@
 ;;; Code:
 ;;
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
 
 (require 'wl-vars)
 (require 'wl-highlight)
diff --git a/wl/wl-util.el b/wl/wl-util.el
index 610a615..00111cc 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -36,11 +36,12 @@
 (require 'elmo-util)
 (require 'elmo-flag)
 (require 'wl-vars)
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
 
 (condition-case nil (require 'pp) (error nil))
 
 (eval-when-compile
-  (require 'cl)
   (require 'time-stamp)
   (defalias-maybe 'next-command-event 'ignore)
   (defalias-maybe 'event-to-character 'ignore)
@@ -363,8 +364,6 @@ The objects mapped (cdrs of elements of the ALIST) are shared."
       (setq keys (cdr keys)))
     result))
 
-(eval-when-compile
-  (require 'static))
 (static-unless (fboundp 'pp)
   (defvar pp-escape-newlines t)
   (defun pp (object &optional stream)