From: teranisi Date: Wed, 29 Aug 2001 10:55:23 +0000 (+0000) Subject: * wl-acap.el (toplevel): Require 'un-define before 'wl; X-Git-Tag: wl-2_7_4~58 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbdc9e6a28719485c430fb68965100f9a557a783;p=elisp%2Fwanderlust.git * wl-acap.el (toplevel): Require 'un-define before 'wl; Don't enclose with `eval-and-compile'. --- diff --git a/wl/ChangeLog b/wl/ChangeLog index 228273c..d2d667c 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,8 @@ 2001-08-29 Yuuichi Teranishi + * wl-acap.el (toplevel): Require 'un-define before 'wl; + Don't enclose with `eval-and-compile'. + * wl.el (wl): Call `elmo-init' and `wl-folder-init' unless wl-init is non-nil. diff --git a/wl/wl-acap.el b/wl/wl-acap.el index e0b38af..949b48a 100644 --- a/wl/wl-acap.el +++ b/wl/wl-acap.el @@ -28,6 +28,12 @@ ;;; Code: ;; +(cond + ((and (featurep 'xemacs) + (module-installed-p 'xemacs-ucs)) + (require 'xemacs-ucs)) + ((module-installed-p 'un-define) + (require 'un-define))) (require 'custom) (require 'cus-edit) (require 'wl-vars) @@ -36,14 +42,6 @@ (require 'acap) (require 'slp) -(eval-and-compile - (cond - ((and (featurep 'xemacs) - (module-installed-p 'xemacs-ucs)) - (require 'xemacs-ucs)) - ((module-installed-p 'un-define) - (require 'un-define)))) - (defconst wl-acap-dataset-class "vendor.wanderlust") (defconst wl-acap-entry-name "settings")