* wl-util.el (mule-version, nemacs-version, emacs-beta-version,

	xemacs-codename, mime-edit-insert-user-agent-field,
	mime-edit-user-agent-value, mime-editor/version,
	mime-editor/codename): Compile warning killer move to
	wl-version.el

diff --git a/wl/ChangeLog b/wl/ChangeLog
index f969572..d9ede62 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -50,7 +50,12 @@
 
        * wl-util.el (wl-generate-user-agent-string,
        wl-extended-emacs-version, wl-extended-emacs-version2,
-       wl-extended-emacs-version3): Move to wl-version.el
+       wl-extended-emacs-version3): Move to wl-version.el.
+       * wl-util.el (mule-version, nemacs-version, emacs-beta-version,
+       xemacs-codename, mime-edit-insert-user-agent-field,
+       mime-edit-user-agent-value, mime-editor/version,
+       mime-editor/codename): Compile warning killer move to
+       wl-version.el
 
 2000-10-09  Kenichi OKADA  <okada@opaopa.org>
 

diff --git a/wl/wl-util.el b/wl/wl-util.el
index c85bd07..30c81ed 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -37,15 +37,6 @@
 (condition-case nil (require 'tm-edit) (error nil))
 (condition-case nil (require 'pp) (error nil))
 
-(defvar mule-version)
-(defvar nemacs-version)
-(defvar emacs-beta-version)
-(defvar xemacs-codename)
-(defvar mime-edit-insert-user-agent-field)
-(defvar mime-edit-user-agent-value)
-(defvar mime-editor/version)
-(defvar mime-editor/codename)
-
 (eval-when-compile
   (require 'time-stamp)
   (defalias-maybe 'read-event 'ignore)

diff --git a/wl/wl-version.el b/wl/wl-version.el
index e72496b..be995eb 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -39,6 +39,19 @@
      (product-version (product-find 'elmo-version))) ; equals to ELMO version.
    "Roam"))
 
+;; require wl-util after product-provide.
+(eval-when-compile (require 'wl-util)) ; wl-match-string
+
+;; compile warning
+(defvar mule-version)
+(defvar nemacs-version)
+(defvar emacs-beta-version)
+(defvar xemacs-codename)
+(defvar mime-edit-insert-user-agent-field)
+(defvar mime-edit-user-agent-value)
+(defvar mime-editor/version)
+(defvar mime-editor/codename)
+
 (defun wl-version (&optional with-codename)
   "Print Wanderlust version."
   (interactive)
@@ -48,8 +61,6 @@
   (interactive)
   (message "%s" (wl-version t)))
 
-(eval-when-compile (require 'wl-util)) ; wl-match-string
-
 (defun wl-generate-user-agent-string ()
   "A candidate of wl-generate-mailer-string-func.
 Insert User-Agent field instead of X-Mailer field."