Merge from trunk:

[elisp/wanderlust.git] / WL-ELS

diff --git a/WL-ELS b/WL-ELS
index 2759bc1..4a0d9ca 100644 (file)
--- a/WL-ELS
+++ b/WL-ELS
@@ -10,18 +10,18 @@
    wl wl-folder wl-summary wl-message
    wl-vars wl-draft wl-util wl-version wl-address wl-addrmgr
    wl-highlight wl-demo wl-refile wl-thread
-   wl-fldmgr wl-expire wl-template wl-score
+   wl-fldmgr wl-expire wl-template wl-score wl-acap
    ))
 
 (defconst ELMO-MODULES '(
-   utf7 pldap mmimap
+   utf7 pldap acap slp mmimap
    elmo-date elmo-util elmo-version elmo-vars elmo elmo-msgdb
    elmo-net elmo-imap4 elmo-pop3 elmo-nntp
    elmo-localdir elmo-localnews elmo-map elmo-maildir
    elmo-multi elmo-filter
    elmo-archive elmo-pipe elmo-cache
-   elmo-internal elmo-mark
-   elmo-dop elmo-nmz
+   elmo-internal elmo-mark elmo-sendlog
+   elmo-dop elmo-nmz elmo-split
    ))
 
 \f
@@ -55,11 +55,11 @@
 (setq WL-MODULES (append WL-MODULES (list 'wl-mime)))
 (setq ELMO-MODULES (append ELMO-MODULES (list 'elmo-mime)))
 (if (not (module-installed-p 'luna))
-    (error "Use FLIM-1.13.2 or later and SEMI 1.13.7 or later."))
+    (error "Use new FLIM & SEMI.  See INSTALL or INSTALL.ja"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Utils
-(defvar UTILS-MODULES '(rfc2368 wl-mailto))
+(defvar UTILS-MODULES '(rfc2368 wl-mailto wl-addrbook wl-complete))
 
 ;; OpenSSL/SSLeay package is also needed.
 (if (module-installed-p 'base64)